Modified lines:	1, 3
Added line:	4, 5, 6, 7, 8, 9, 10, 84
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

	DiffViewer/output/AnalysisResults.java//AnalysisResults.java_000		DiffViewer/output/AnalysisResults.java//AnalysisResults.java_001
	126 lines 5326 bytes Last modified : Mon May 14 23:47:19 2012		134 lines 5544 bytes Last modified : Mon May 14 23:47:19 2012
1	//Time : 2012-04-12 06:34:46.721	1	//Time : 2012-04-12 06:35:05.964
2	//Files Open : /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java /pvekris/src/main/java/energy/interproc/CtxSensLocking.java /pvekris/src/main/java/energy/analysis/WakeLockManager.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/SpecialConditions.java /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/ComponentManager.java	2	//Files Open : /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java /pvekris/src/main/java/energy/interproc/CtxSensLocking.java /pvekris/src/main/java/energy/analysis/WakeLockManager.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/SpecialConditions.java /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/ComponentManager.java
3	package energy.analysis;	3	/*AST Changes :
		4	CHANGE MethodDeclaration to MethodDeclaration = 1
		5	INSERT ExpressionStmt = 1
		6	changes = 1
		7	changes to method processResults = 1
		8	inserts = 1
		9	public method declarations = 1
		10	*/package energy.analysis;
4	import java.util.EnumMap;	11	import java.util.EnumMap;
5	import java.util.HashMap;	12	import java.util.HashMap;
6	import java.util.HashSet;	13	import java.util.HashSet;
7	import java.util.Map;	14	import java.util.Map;
8	import java.util.Map.Entry;	15	import java.util.Map.Entry;
9	import java.util.Set;	16	import java.util.Set;
10	import com.ibm.wala.types.FieldReference;	17	import com.ibm.wala.types.FieldReference;
11	import com.ibm.wala.util.collections.Pair;	18	import com.ibm.wala.util.collections.Pair;
12	import energy.components.Component;	19	import energy.components.Component;
13	import energy.interproc.CompoundLockState;	20	import energy.interproc.CompoundLockState;
14	import energy.interproc.SingleLockState;	21	import energy.interproc.SingleLockState;
15	import energy.util.E;	22	import energy.util.E;
16	public class AnalysisResults {	23	public class AnalysisResults {
17	private HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>> resultStuff=null;	24	private HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>> resultStuff=null;
18	public class ComponentResult {	25	public class ComponentResult {
19	HashMap<String,CompoundLockState> callBackExitStates;	26	HashMap<String,CompoundLockState> callBackExitStates;
20	public ComponentResult(){	27	public ComponentResult(){
21	callBackExitStates=new HashMap<String,CompoundLockState>();	28	callBackExitStates=new HashMap<String,CompoundLockState>();
22	}	29	}
23	}	30	}
24	/**	31	/**
25	* The constructor	32	* The constructor
26	*/	33	*/
27	AnalysisResults(){	34	AnalysisResults(){
28	resultStuff=new HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>>();	35	resultStuff=new HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>>();
29	callBackResultMap=new HashMap<Pair<String,String>,EnumMap<LockUsage,Integer>>();	36	callBackResultMap=new HashMap<Pair<String,String>,EnumMap<LockUsage,Integer>>();
30	}	37	}
31	int threadCount=0;	38	int threadCount=0;
32	int activityCount=0;	39	int activityCount=0;
33	int lockThreads=0;	40	int lockThreads=0;
34	int nolockThreads=0;	41	int nolockThreads=0;
35	int unlockThreads=0;	42	int unlockThreads=0;
36	int lockunlockThreads=0;	43	int lockunlockThreads=0;
37	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}	44	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}
38	private Map<Pair<String,String>,EnumMap<LockUsage,Integer>> callBackResultMap;	45	private Map<Pair<String,String>,EnumMap<LockUsage,Integer>> callBackResultMap;
39	public void registerExitLockState( Component component, Map<String,Map<FieldReference,Set<SingleLockState>>> map){	46	public void registerExitLockState( Component component, Map<String,Map<FieldReference,Set<SingleLockState>>> map){
40	resultStuff.add(Pair.make(component,map));	47	resultStuff.add(Pair.make(component,map));
41	StringBuffer sb=new StringBuffer();	48	StringBuffer sb=new StringBuffer();
42	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : map.entrySet()) {	49	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : map.entrySet()) {
43	if (e.getValue().size() > 0) {	50	if (e.getValue().size() > 0) {
44	sb.append(e.getKey() + "\n");	51	sb.append(e.getKey() + "\n");
45	for ( Entry<FieldReference,Set<SingleLockState>> entry : e.getValue().entrySet()) {	52	for ( Entry<FieldReference,Set<SingleLockState>> entry : e.getValue().entrySet()) {
46	sb.append(entry.getKey() + " -> " + entry.getValue().toString());	53	sb.append(entry.getKey() + " -> " + entry.getValue().toString());
47	}	54	}
48	}	55	}
49	}	56	}
50	if (sb.length() > 0) {	57	if (sb.length() > 0) {
51	E.log(1,component.toString() + "\n" + sb.toString());	58	E.log(1,component.toString() + "\n" + sb.toString());
52	}	59	}
53	}	60	}
54	private LockUsage getLockUsage( SingleLockState runState){	61	private LockUsage getLockUsage( SingleLockState runState){
55	if (runState != null) {	62	if (runState != null) {
56	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {	63	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {
57	return LockUsage.LOCKING;	64	return LockUsage.LOCKING;
58	}	65	}
59	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	66	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
60	return LockUsage.EMPTY;	67	return LockUsage.EMPTY;
61	}	68	}
62	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	69	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
63	return LockUsage.FULL_UNLOCKING;	70	return LockUsage.FULL_UNLOCKING;
64	}	71	}
65	else if (runState.isMaybeReleased()) {	72	else if (runState.isMaybeReleased()) {
66	return LockUsage.UNLOCKING;	73	return LockUsage.UNLOCKING;
67	}	74	}
68	else {	75	else {
69	return LockUsage.UNKNOWN_STATE;	76	return LockUsage.UNKNOWN_STATE;
70	}	77	}
71	}	78	}
72	else {	79	else {
73	return LockUsage.EMPTY;	80	return LockUsage.EMPTY;
74	}	81	}
75	}	82	}
76	public void processResults(){	83	public void processResults(){
		84	System.out.pr=$missing$;
77	for ( Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>> pair : resultStuff) {	85	for ( Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>> pair : resultStuff) {
78	Component component=pair.fst;	86	Component component=pair.fst;
79	String componentName=component.getComponentName();	87	String componentName=component.getComponentName();
80	Map<String,Map<FieldReference,Set<SingleLockState>>> callBackMap=pair.snd;	88	Map<String,Map<FieldReference,Set<SingleLockState>>> callBackMap=pair.snd;
81	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : callBackMap.entrySet()) {	89	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : callBackMap.entrySet()) {
82	String callBackName=e.getKey();	90	String callBackName=e.getKey();
83	Pair<String,String> compAndCB=Pair.make(component.toString(),callBackName);	91	Pair<String,String> compAndCB=Pair.make(component.toString(),callBackName);
84	Pair<String,String> abstCompAndCB=Pair.make(componentName,callBackName);	92	Pair<String,String> abstCompAndCB=Pair.make(componentName,callBackName);
85	HashMap<FieldReference,LockUsage> lockUsages=new HashMap<FieldReference,LockUsage>();	93	HashMap<FieldReference,LockUsage> lockUsages=new HashMap<FieldReference,LockUsage>();
86	for ( Entry<FieldReference,Set<SingleLockState>> fs : e.getValue().entrySet()) {	94	for ( Entry<FieldReference,Set<SingleLockState>> fs : e.getValue().entrySet()) {
87	FieldReference field=fs.getKey();	95	FieldReference field=fs.getKey();
88	Set<SingleLockState> sls=fs.getValue();	96	Set<SingleLockState> sls=fs.getValue();
89	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);	97	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);
90	LockUsage lockUsage=getLockUsage(sl);	98	LockUsage lockUsage=getLockUsage(sl);
91	lockUsages.put(field,lockUsage);	99	lockUsages.put(field,lockUsage);
92	EnumMap<LockUsage,Integer> enumMap=callBackResultMap.get(abstCompAndCB);	100	EnumMap<LockUsage,Integer> enumMap=callBackResultMap.get(abstCompAndCB);
93	if (lockUsage != LockUsage.EMPTY) {	101	if (lockUsage != LockUsage.EMPTY) {
94	E.log(1,compAndCB.toString() + " :: " + lockUsage.toString());	102	E.log(1,compAndCB.toString() + " :: " + lockUsage.toString());
95	}	103	}
96	updateEnumMap(enumMap,lockUsage);	104	updateEnumMap(enumMap,lockUsage);
97	}	105	}
98	}	106	}
99	}	107	}
100	}	108	}
101	private void updateEnumMap( EnumMap<LockUsage,Integer> enumMap, LockUsage lockUsage){	109	private void updateEnumMap( EnumMap<LockUsage,Integer> enumMap, LockUsage lockUsage){
102	if (enumMap == null) {	110	if (enumMap == null) {
103	enumMap=new EnumMap<LockUsage,Integer>(LockUsage.class);	111	enumMap=new EnumMap<LockUsage,Integer>(LockUsage.class);
104	}	112	}
105	Integer count=enumMap.get(lockUsage);	113	Integer count=enumMap.get(lockUsage);
106	if (count == null) {	114	if (count == null) {
107	count=new Integer(1);	115	count=new Integer(1);
108	enumMap.put(lockUsage,count);	116	enumMap.put(lockUsage,count);
109	}	117	}
110	else {	118	else {
111	enumMap.put(lockUsage,count + 1);	119	enumMap.put(lockUsage,count + 1);
112	}	120	}
113	}	121	}
114	public void outputFinalResults(){	122	public void outputFinalResults(){
115	for ( Entry<Pair<String,String>,EnumMap<LockUsage,Integer>> e : callBackResultMap.entrySet()) {	123	for ( Entry<Pair<String,String>,EnumMap<LockUsage,Integer>> e : callBackResultMap.entrySet()) {
116	Pair<String,String> key=e.getKey();	124	Pair<String,String> key=e.getKey();
117	E.log(1,key.toString());	125	E.log(1,key.toString());
118	EnumMap<LockUsage,Integer> usages=e.getValue();	126	EnumMap<LockUsage,Integer> usages=e.getValue();
119	for ( Entry<LockUsage,Integer> u : usages.entrySet()) {	127	for ( Entry<LockUsage,Integer> u : usages.entrySet()) {
120	LockUsage usage=u.getKey();	128	LockUsage usage=u.getKey();
121	Integer count=u.getValue();	129	Integer count=u.getValue();
122	E.log(1,"--> " + usage.toString() + " :: "+ count.toString());	130	E.log(1,"--> " + usage.toString() + " :: "+ count.toString());
123	}	131	}
124	}	132	}
125	}	133	}
126	}	134	}

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_000 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_001

Modified lines:	1, 5, 84
Added line:	4
Removed line:	6, 8

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

	DiffViewer/output/AnalysisResults.java//AnalysisResults.java_001		DiffViewer/output/AnalysisResults.java//AnalysisResults.java_002
	134 lines 5544 bytes Last modified : Mon May 14 23:47:19 2012		133 lines 5548 bytes Last modified : Mon May 14 23:47:19 2012
1	//Time : 2012-04-12 06:35:05.964	1	//Time : 2012-04-12 06:35:08.289
2	//Files Open : /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java /pvekris/src/main/java/energy/interproc/CtxSensLocking.java /pvekris/src/main/java/energy/analysis/WakeLockManager.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/SpecialConditions.java /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/ComponentManager.java	2	//Files Open : /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java /pvekris/src/main/java/energy/interproc/CtxSensLocking.java /pvekris/src/main/java/energy/analysis/WakeLockManager.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/SpecialConditions.java /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/ComponentManager.java
3	/*AST Changes :	3	/*AST Changes :
		4	CHANGE ExpressionStmt to ExpressionStmt = 1
4	CHANGE MethodDeclaration to MethodDeclaration = 1	5	CHANGE MethodDeclaration to MethodDeclaration = 1
5	INSERT ExpressionStmt = 1	6	changes = 2
6	changes = 1
7	changes to method processResults = 1	7	changes to method processResults = 1
8	inserts = 1
9	public method declarations = 1	8	public method declarations = 1
10	*/package energy.analysis;	9	*/package energy.analysis;
11	import java.util.EnumMap;	10	import java.util.EnumMap;
12	import java.util.HashMap;	11	import java.util.HashMap;
13	import java.util.HashSet;	12	import java.util.HashSet;
14	import java.util.Map;	13	import java.util.Map;
15	import java.util.Map.Entry;	14	import java.util.Map.Entry;
16	import java.util.Set;	15	import java.util.Set;
17	import com.ibm.wala.types.FieldReference;	16	import com.ibm.wala.types.FieldReference;
18	import com.ibm.wala.util.collections.Pair;	17	import com.ibm.wala.util.collections.Pair;
19	import energy.components.Component;	18	import energy.components.Component;
20	import energy.interproc.CompoundLockState;	19	import energy.interproc.CompoundLockState;
21	import energy.interproc.SingleLockState;	20	import energy.interproc.SingleLockState;
22	import energy.util.E;	21	import energy.util.E;
23	public class AnalysisResults {	22	public class AnalysisResults {
24	private HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>> resultStuff=null;	23	private HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>> resultStuff=null;
25	public class ComponentResult {	24	public class ComponentResult {
26	HashMap<String,CompoundLockState> callBackExitStates;	25	HashMap<String,CompoundLockState> callBackExitStates;
27	public ComponentResult(){	26	public ComponentResult(){
28	callBackExitStates=new HashMap<String,CompoundLockState>();	27	callBackExitStates=new HashMap<String,CompoundLockState>();
29	}	28	}
30	}	29	}
31	/**	30	/**
32	* The constructor	31	* The constructor
33	*/	32	*/
34	AnalysisResults(){	33	AnalysisResults(){
35	resultStuff=new HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>>();	34	resultStuff=new HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>>();
36	callBackResultMap=new HashMap<Pair<String,String>,EnumMap<LockUsage,Integer>>();	35	callBackResultMap=new HashMap<Pair<String,String>,EnumMap<LockUsage,Integer>>();
37	}	36	}
38	int threadCount=0;	37	int threadCount=0;
39	int activityCount=0;	38	int activityCount=0;
40	int lockThreads=0;	39	int lockThreads=0;
41	int nolockThreads=0;	40	int nolockThreads=0;
42	int unlockThreads=0;	41	int unlockThreads=0;
43	int lockunlockThreads=0;	42	int lockunlockThreads=0;
44	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}	43	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}
45	private Map<Pair<String,String>,EnumMap<LockUsage,Integer>> callBackResultMap;	44	private Map<Pair<String,String>,EnumMap<LockUsage,Integer>> callBackResultMap;
46	public void registerExitLockState( Component component, Map<String,Map<FieldReference,Set<SingleLockState>>> map){	45	public void registerExitLockState( Component component, Map<String,Map<FieldReference,Set<SingleLockState>>> map){
47	resultStuff.add(Pair.make(component,map));	46	resultStuff.add(Pair.make(component,map));
48	StringBuffer sb=new StringBuffer();	47	StringBuffer sb=new StringBuffer();
49	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : map.entrySet()) {	48	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : map.entrySet()) {
50	if (e.getValue().size() > 0) {	49	if (e.getValue().size() > 0) {
51	sb.append(e.getKey() + "\n");	50	sb.append(e.getKey() + "\n");
52	for ( Entry<FieldReference,Set<SingleLockState>> entry : e.getValue().entrySet()) {	51	for ( Entry<FieldReference,Set<SingleLockState>> entry : e.getValue().entrySet()) {
53	sb.append(entry.getKey() + " -> " + entry.getValue().toString());	52	sb.append(entry.getKey() + " -> " + entry.getValue().toString());
54	}	53	}
55	}	54	}
56	}	55	}
57	if (sb.length() > 0) {	56	if (sb.length() > 0) {
58	E.log(1,component.toString() + "\n" + sb.toString());	57	E.log(1,component.toString() + "\n" + sb.toString());
59	}	58	}
60	}	59	}
61	private LockUsage getLockUsage( SingleLockState runState){	60	private LockUsage getLockUsage( SingleLockState runState){
62	if (runState != null) {	61	if (runState != null) {
63	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {	62	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {
64	return LockUsage.LOCKING;	63	return LockUsage.LOCKING;
65	}	64	}
66	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	65	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
67	return LockUsage.EMPTY;	66	return LockUsage.EMPTY;
68	}	67	}
69	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	68	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
70	return LockUsage.FULL_UNLOCKING;	69	return LockUsage.FULL_UNLOCKING;
71	}	70	}
72	else if (runState.isMaybeReleased()) {	71	else if (runState.isMaybeReleased()) {
73	return LockUsage.UNLOCKING;	72	return LockUsage.UNLOCKING;
74	}	73	}
75	else {	74	else {
76	return LockUsage.UNKNOWN_STATE;	75	return LockUsage.UNKNOWN_STATE;
77	}	76	}
78	}	77	}
79	else {	78	else {
80	return LockUsage.EMPTY;	79	return LockUsage.EMPTY;
81	}	80	}
82	}	81	}
83	public void processResults(){	82	public void processResults(){
84	System.out.pr=$missing$;	83	System.out.println();
85	for ( Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>> pair : resultStuff) {	84	for ( Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>> pair : resultStuff) {
86	Component component=pair.fst;	85	Component component=pair.fst;
87	String componentName=component.getComponentName();	86	String componentName=component.getComponentName();
88	Map<String,Map<FieldReference,Set<SingleLockState>>> callBackMap=pair.snd;	87	Map<String,Map<FieldReference,Set<SingleLockState>>> callBackMap=pair.snd;
89	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : callBackMap.entrySet()) {	88	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : callBackMap.entrySet()) {
90	String callBackName=e.getKey();	89	String callBackName=e.getKey();
91	Pair<String,String> compAndCB=Pair.make(component.toString(),callBackName);	90	Pair<String,String> compAndCB=Pair.make(component.toString(),callBackName);
92	Pair<String,String> abstCompAndCB=Pair.make(componentName,callBackName);	91	Pair<String,String> abstCompAndCB=Pair.make(componentName,callBackName);
93	HashMap<FieldReference,LockUsage> lockUsages=new HashMap<FieldReference,LockUsage>();	92	HashMap<FieldReference,LockUsage> lockUsages=new HashMap<FieldReference,LockUsage>();
94	for ( Entry<FieldReference,Set<SingleLockState>> fs : e.getValue().entrySet()) {	93	for ( Entry<FieldReference,Set<SingleLockState>> fs : e.getValue().entrySet()) {
95	FieldReference field=fs.getKey();	94	FieldReference field=fs.getKey();
96	Set<SingleLockState> sls=fs.getValue();	95	Set<SingleLockState> sls=fs.getValue();
97	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);	96	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);
98	LockUsage lockUsage=getLockUsage(sl);	97	LockUsage lockUsage=getLockUsage(sl);
99	lockUsages.put(field,lockUsage);	98	lockUsages.put(field,lockUsage);
100	EnumMap<LockUsage,Integer> enumMap=callBackResultMap.get(abstCompAndCB);	99	EnumMap<LockUsage,Integer> enumMap=callBackResultMap.get(abstCompAndCB);
101	if (lockUsage != LockUsage.EMPTY) {	100	if (lockUsage != LockUsage.EMPTY) {
102	E.log(1,compAndCB.toString() + " :: " + lockUsage.toString());	101	E.log(1,compAndCB.toString() + " :: " + lockUsage.toString());
103	}	102	}
104	updateEnumMap(enumMap,lockUsage);	103	updateEnumMap(enumMap,lockUsage);
105	}	104	}
106	}	105	}
107	}	106	}
108	}	107	}
109	private void updateEnumMap( EnumMap<LockUsage,Integer> enumMap, LockUsage lockUsage){	108	private void updateEnumMap( EnumMap<LockUsage,Integer> enumMap, LockUsage lockUsage){
110	if (enumMap == null) {	109	if (enumMap == null) {
111	enumMap=new EnumMap<LockUsage,Integer>(LockUsage.class);	110	enumMap=new EnumMap<LockUsage,Integer>(LockUsage.class);
112	}	111	}
113	Integer count=enumMap.get(lockUsage);	112	Integer count=enumMap.get(lockUsage);
114	if (count == null) {	113	if (count == null) {
115	count=new Integer(1);	114	count=new Integer(1);
116	enumMap.put(lockUsage,count);	115	enumMap.put(lockUsage,count);
117	}	116	}
118	else {	117	else {
119	enumMap.put(lockUsage,count + 1);	118	enumMap.put(lockUsage,count + 1);
120	}	119	}
121	}	120	}
122	public void outputFinalResults(){	121	public void outputFinalResults(){
123	for ( Entry<Pair<String,String>,EnumMap<LockUsage,Integer>> e : callBackResultMap.entrySet()) {	122	for ( Entry<Pair<String,String>,EnumMap<LockUsage,Integer>> e : callBackResultMap.entrySet()) {
124	Pair<String,String> key=e.getKey();	123	Pair<String,String> key=e.getKey();
125	E.log(1,key.toString());	124	E.log(1,key.toString());
126	EnumMap<LockUsage,Integer> usages=e.getValue();	125	EnumMap<LockUsage,Integer> usages=e.getValue();
127	for ( Entry<LockUsage,Integer> u : usages.entrySet()) {	126	for ( Entry<LockUsage,Integer> u : usages.entrySet()) {
128	LockUsage usage=u.getKey();	127	LockUsage usage=u.getKey();
129	Integer count=u.getValue();	128	Integer count=u.getValue();
130	E.log(1,"--> " + usage.toString() + " :: "+ count.toString());	129	E.log(1,"--> " + usage.toString() + " :: "+ count.toString());
131	}	130	}
132	}	131	}
133	}	132	}
134	}	133	}

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_001 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_002

Modified lines:	1, 83
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_002 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_003

Modified lines:	1, 83
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_003 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_004

Modified lines:	1, 2, 3, 4, 16, 31, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 56, 57, 82, 83, 84, 86, 87, 88, 89, 90, 91, 92, 93, 94, 97, 98, 101, 108, 109, 110, 112, 113, 117, 118, 121, 122, 123, 124, 125, 126, 127, 128, 129
Added line:	7, 13, 15, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 69, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 90, 117, 118, 119, 130, 131, 132, 133, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 197, 198, 199, 206, 207, 208, 209, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301
Removed line:	5, 6, 7, 8, 9, 10, 23, 24, 25, 26, 27, 28, 29, 99, 103, 114, 115

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

	DiffViewer/output/AnalysisResults.java//AnalysisResults.java_004		DiffViewer/output/AnalysisResults.java//AnalysisResults.java_005
	133 lines 5552 bytes Last modified : Mon May 14 23:47:19 2012		305 lines 11787 bytes Last modified : Mon May 14 23:48:02 2012
1	//Time : 2012-04-12 06:35:10.781	1	//Time : 2012-04-24 18:21:38.377
2	//Files Open : /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java /pvekris/src/main/java/energy/interproc/CtxSensLocking.java /pvekris/src/main/java/energy/analysis/WakeLockManager.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/SpecialConditions.java /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/ComponentManager.java	2	//Files Open : /pvekris/src/main/java/energy/analysis/AnalysisResults.java /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java
3	/*AST Changes :	3	package energy.analysis;
4	CHANGE ExpressionStmt to ExpressionStmt = 1	4	import java.util.ArrayList;
5	CHANGE MethodDeclaration to MethodDeclaration = 1
6	changes = 2
7	changes to method processResults = 1
8	public method declarations = 1
9	*/package energy.analysis;
10	import java.util.EnumMap;
11	import java.util.HashMap;	5	import java.util.HashMap;
12	import java.util.HashSet;	6	import java.util.HashSet;
		7	import java.util.Iterator;
13	import java.util.Map;	8	import java.util.Map;
14	import java.util.Map.Entry;	9	import java.util.Map.Entry;
15	import java.util.Set;	10	import java.util.Set;
16	import com.ibm.wala.types.FieldReference;	11	import com.ibm.wala.ipa.callgraph.CGNode;
17	import com.ibm.wala.util.collections.Pair;	12	import com.ibm.wala.util.collections.Pair;
		13	import energy.analysis.WakeLockManager.WakeLockInstance;
18	import energy.components.Component;	14	import energy.components.Component;
		15	import energy.components.Component.CallBack;
19	import energy.interproc.CompoundLockState;	16	import energy.interproc.CompoundLockState;
20	import energy.interproc.SingleLockState;	17	import energy.interproc.SingleLockState;
21	import energy.util.E;	18	import energy.util.E;
22	public class AnalysisResults {	19	public class AnalysisResults {
23	private HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>> resultStuff=null;
24	public class ComponentResult {
25	HashMap<String,CompoundLockState> callBackExitStates;
26	public ComponentResult(){
27	callBackExitStates=new HashMap<String,CompoundLockState>();
28	}
29	}
30	/**	20	/**
31	* The constructor	21	* Main structures that hold the analysis results for every component
32	*/	22	*/
33	AnalysisResults(){	23	private HashSet<Pair<Component,ComponentSummary>> allStates=null;
34	resultStuff=new HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>>();	24	public class ComponentSummary {
35	callBackResultMap=new HashMap<Pair<String,String>,EnumMap<LockUsage,Integer>>();	25	private Component component;
36	}	26	private HashMap<CallBack,CompoundLockState> callBackExitStates;
37	int threadCount=0;	27	private HashMap<CGNode,CompoundLockState> allExitStates;
38	int activityCount=0;	28	public ComponentSummary( Component c){
39	int lockThreads=0;	29	this.component=c;
40	int nolockThreads=0;	30	allExitStates=new HashMap<CGNode,CompoundLockState>();
41	int unlockThreads=0;	31	callBackExitStates=new HashMap<Component.CallBack,CompoundLockState>();
42	int lockunlockThreads=0;	32	}
43	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}	33	public HashMap<CGNode,CompoundLockState> getAllExitStates(){
44	private Map<Pair<String,String>,EnumMap<LockUsage,Integer>> callBackResultMap;	34	return allExitStates;
45	public void registerExitLockState( Component component, Map<String,Map<FieldReference,Set<SingleLockState>>> map){	35	}
46	resultStuff.add(Pair.make(component,map));	36	public void registerNodeState( CGNode n, CompoundLockState st){
47	StringBuffer sb=new StringBuffer();	37	allExitStates.put(n,st);
48	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : map.entrySet()) {	38	}
49	if (e.getValue().size() > 0) {	39	public void registerCallBackState( CallBack cb, CompoundLockState st){
50	sb.append(e.getKey() + "\n");	40	callBackExitStates.put(cb,st);
51	for ( Entry<FieldReference,Set<SingleLockState>> entry : e.getValue().entrySet()) {	41	}
52	sb.append(entry.getKey() + " -> " + entry.getValue().toString());	42	public CompoundLockState getStateForMethod( String method){
		43	return allExitStates.get(method);
		44	}
		45	public String toString(){
		46	StringBuffer sb=new StringBuffer();
		47	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {
		48	CGNode next=it.next();
		49	String name=next.getMethod().getName().toString();
		50	CompoundLockState stateForMethod=getStateForMethod(name);
		51	if (stateForMethod != null) {
		52	sb.append(name + ":\n" + stateForMethod.toString());
		53	}
		54	}
		55	HashSet<CallBack> callbacks=component.getCallbacks();
		56	if (callbacks != null) {
		57	if (callbacks.size() > 0) {
		58	sb.append("Callbacks:\n");
		59	for ( CallBack cb : callbacks) {
		60	String name=cb.getName();
		61	;
		62	CompoundLockState stateForMethod=getStateForMethod(name);
		63	if (stateForMethod != null) {
		64	sb.append(" " + name + ":\n"+ stateForMethod.toString());
		65	}
		66	}
53	}	67	}
54	}	68	}
		69	return null;
55	}	70	}
56	if (sb.length() > 0) {	71	}
57	E.log(1,component.toString() + "\n" + sb.toString());	72	public AnalysisResults(){
		73	allStates=new HashSet<Pair<Component,ComponentSummary>>();
		74	}
		75	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}
		76	/**
		77	* Invoke this after the component has been analyzed
		78	* @param component
		79	*/
		80	public void createComponentSummary( Component component){
		81	ComponentSummary componentSummary=new ComponentSummary(component);
		82	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {
		83	CGNode next=it.next();
		84	Map<WakeLockInstance,Set<SingleLockState>> exitState=component.getExitState(next);
		85	if (exitState != null) {
		86	CompoundLockState compoundLockState=new CompoundLockState(exitState);
		87	componentSummary.registerNodeState(next,compoundLockState);
		88	}
58	}	89	}
		90	allStates.add(Pair.make(component,componentSummary));
59	}	91	}
60	private LockUsage getLockUsage( SingleLockState runState){	92	private LockUsage getLockUsage( SingleLockState runState){
61	if (runState != null) {	93	if (runState != null) {
62	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {	94	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {
63	return LockUsage.LOCKING;	95	return LockUsage.LOCKING;
64	}	96	}
65	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	97	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
66	return LockUsage.EMPTY;	98	return LockUsage.EMPTY;
67	}	99	}
68	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	100	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
69	return LockUsage.FULL_UNLOCKING;	101	return LockUsage.FULL_UNLOCKING;
70	}	102	}
71	else if (runState.isMaybeReleased()) {	103	else if (runState.isMaybeReleased()) {
72	return LockUsage.UNLOCKING;	104	return LockUsage.UNLOCKING;
73	}	105	}
74	else {	106	else {
75	return LockUsage.UNKNOWN_STATE;	107	return LockUsage.UNKNOWN_STATE;
76	}	108	}
77	}	109	}
78	else {	110	else {
79	return LockUsage.EMPTY;	111	return LockUsage.EMPTY;
80	}	112	}
81	}	113	}
82	public void processResults(){	114	public ArrayList<String> processResults(){
83	System.out.println("\n");	115	ArrayList<String> result=null;
84	for ( Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>> pair : resultStuff) {	116	System.out.println("\n==========================================");
		117	HashMap<LockUsage,Set<Pair<Component,CGNode>>> usageMap=new HashMap<LockUsage,Set<Pair<Component,CGNode>>>();
		118	HashMap<Component,Logger> componentMap=new HashMap<Component,Logger>();
		119	for ( Pair<Component,ComponentSummary> pair : allStates) {
85	Component component=pair.fst;	120	Component component=pair.fst;
86	String componentName=component.getComponentName();	121	ComponentSummary cSummary=pair.snd;
87	Map<String,Map<FieldReference,Set<SingleLockState>>> callBackMap=pair.snd;	122	ComponentPolicy policy=new ComponentPolicy(component);
88	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : callBackMap.entrySet()) {	123	StringBuffer sb=new StringBuffer();
89	String callBackName=e.getKey();	124	boolean printComponent=false;
90	Pair<String,String> compAndCB=Pair.make(component.toString(),callBackName);	125	for ( Entry<CGNode,CompoundLockState> e : cSummary.getAllExitStates().entrySet()) {
91	Pair<String,String> abstCompAndCB=Pair.make(componentName,callBackName);	126	CGNode node=e.getKey();
92	HashMap<FieldReference,LockUsage> lockUsages=new HashMap<FieldReference,LockUsage>();	127	HashMap<WakeLockInstance,LockUsage> lockUsages=new HashMap<WakeLockInstance,LockUsage>();
93	for ( Entry<FieldReference,Set<SingleLockState>> fs : e.getValue().entrySet()) {	128	boolean printMethod=false;
94	FieldReference field=fs.getKey();	129	LockUsage lockUsage=LockUsage.EMPTY;
		130	CompoundLockState compLS=e.getValue();
		131	Map<WakeLockInstance,Set<SingleLockState>> allLockStates=compLS.getAllLockStates();
		132	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : allLockStates.entrySet()) {
		133	WakeLockInstance wli=fs.getKey();
95	Set<SingleLockState> sls=fs.getValue();	134	Set<SingleLockState> sls=fs.getValue();
96	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);	135	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);
97	LockUsage lockUsage=getLockUsage(sl);	136	lockUsage=getLockUsage(sl);
98	lockUsages.put(field,lockUsage);	137	lockUsages.put(wli,lockUsage);
99	EnumMap<LockUsage,Integer> enumMap=callBackResultMap.get(abstCompAndCB);
100	if (lockUsage != LockUsage.EMPTY) {	138	if (lockUsage != LockUsage.EMPTY) {
101	E.log(1,compAndCB.toString() + " :: " + lockUsage.toString());	139	printMethod=true;
102	}	140	}
103	updateEnumMap(enumMap,lockUsage);
104	}	141	}
		142	if (printMethod) {
		143	if (Opts.OUTPUT_ALL_NODE_INFO \|\| component.isCallBack(node)) {
		144	printComponent=true;
		145	HashSet<SingleLockState> tempState=new HashSet<SingleLockState>();
		146	sb.append(" " + node.getMethod().getSignature().toString() + "\n");
		147	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : compLS.getAllLockStates().entrySet()) {
		148	WakeLockInstance key=fs.getKey();
		149	Set<SingleLockState> value=fs.getValue();
		150	tempState.add(SingleLockState.mergeSingleLockStates(value));
		151	sb.append("\t" + key.toString() + "\n\t"+ value.toString()+ "\n");
		152	}
		153	SingleLockState mergedLS=SingleLockState.mergeSingleLockStates(tempState);
		154	LockUsage lu=getLockUsage(mergedLS);
		155	if (component.isCallBack(node)) {
		156	if (usageMap.containsKey(lu)) {
		157	usageMap.get(lu).add(Pair.make(component,node));
		158	}
		159	else {
		160	HashSet<Pair<Component,CGNode>> set=new HashSet<Pair<Component,CGNode>>();
		161	set.add(Pair.make(component,node));
		162	usageMap.put(lu,set);
		163	}
		164	policy.addFact(node,mergedLS);
		165	}
		166	}
		167	}
		168	}
		169	if (printComponent) {
		170	System.out.println(component.toString() + "\n" + sb.toString());
		171	policy.solveFacts();
		172	componentMap.put(component,policy.getLogger());
105	}	173	}
106	}	174	}
		175	System.out.println("==========================================\n");
		176	for ( LockUsage e : usageMap.keySet()) {
		177	System.out.println(e.toString());
		178	for ( Pair<Component,CGNode> s : usageMap.get(e)) {
		179	System.out.println(" " + s.toString());
		180	}
		181	}
		182	System.out.println("==========================================\n");
		183	for ( Component e : componentMap.keySet()) {
		184	Logger logger=componentMap.get(e);
		185	if (!logger.isEmpty()) {
		186	System.out.println(e.toString());
		187	System.out.println(logger.toString());
		188	System.out.println("\n");
		189	}
		190	result=logger.getStringList();
		191	}
		192	return result;
107	}	193	}
108	private void updateEnumMap( EnumMap<LockUsage,Integer> enumMap, LockUsage lockUsage){	194	public class Logger extends ArrayList<String> {
109	if (enumMap == null) {	195	private static final long serialVersionUID=4402714524487791090L;
110	enumMap=new EnumMap<LockUsage,Integer>(LockUsage.class);	196	public void output(){
		197	for ( String s : this) {
		198	System.out.println(" " + s);
		199	}
111	}	200	}
112	Integer count=enumMap.get(lockUsage);	201	public ArrayList<String> getStringList(){
113	if (count == null) {	202	return this;
114	count=new Integer(1);
115	enumMap.put(lockUsage,count);
116	}	203	}
117	else {	204	public String toString(){
118	enumMap.put(lockUsage,count + 1);	205	StringBuffer result=new StringBuffer();
		206	for ( String s : this) {
		207	result.append(s + "\n");
		208	}
		209	return result.toString();
119	}	210	}
120	}	211	}
121	public void outputFinalResults(){	212	public class ComponentPolicy {
122	for ( Entry<Pair<String,String>,EnumMap<LockUsage,Integer>> e : callBackResultMap.entrySet()) {	213	private Component component;
123	Pair<String,String> key=e.getKey();	214	public ComponentPolicy( Component component){
124	E.log(1,key.toString());	215	this.component=component;
125	EnumMap<LockUsage,Integer> usages=e.getValue();	216	map=new HashMap<String,SingleLockState>();
126	for ( Entry<LockUsage,Integer> u : usages.entrySet()) {	217	logger=new Logger();
127	LockUsage usage=u.getKey();	218	}
128	Integer count=u.getValue();	219	private HashMap<String,SingleLockState> map;
129	E.log(1,"--> " + usage.toString() + " :: "+ count.toString());	220	public void addFact( CGNode n, SingleLockState st){
		221	map.put(n.getMethod().getName().toString(),st);
		222	}
		223	private boolean unlocking( SingleLockState state){
		224	return (strongUnlocking(state) \|\| weakUnlocking(state));
		225	}
		226	private boolean strongUnlocking( SingleLockState state){
		227	if (state != null) {
		228	return (getLockUsage(state).equals(LockUsage.FULL_UNLOCKING));
		229	}
		230	return false;
		231	}
		232	private boolean weakUnlocking( SingleLockState state){
		233	if (state != null) {
		234	return (getLockUsage(state).equals(LockUsage.UNLOCKING));
		235	}
		236	return false;
		237	}
		238	private boolean locking( SingleLockState onCreateState){
		239	if (onCreateState != null) {
		240	return (getLockUsage(onCreateState).equals(LockUsage.LOCKING));
		241	}
		242	return false;
		243	}
		244	private Logger logger;
		245	private void logNote( String s){
		246	logger.add(s);
		247	}
		248	public Logger getLogger(){
		249	return logger;
		250	}
		251	private SingleLockState getServiceOnStart(){
		252	SingleLockState onStart=map.get("onStart");
		253	SingleLockState onStartCommand=map.get("onStartCommand");
		254	if (onStartCommand == null) {
		255	return onStart;
		256	}
		257	else {
		258	return onStartCommand;
		259	}
		260	}
		261	/**
		262	* TODO: make sure the same lock is locked and unlocked...
		263	*/
		264	public void solveFacts(){
		265	E.log(1,"Looking for: " + component.getComponentType());
		266	if (component.getComponentType().equals("Activity")) {
		267	SingleLockState onCreateState=map.get("onCreate");
		268	if (locking(onCreateState)) {
		269	logNote("STRONG BUG: Locking @ onCreate");
		270	}
		271	SingleLockState onStartState=map.get("onStart");
		272	if (locking(onStartState)) {
		273	logNote("POSSIBLE BUG: Locking @ onStart");
		274	}
		275	SingleLockState onPauseState=map.get("onPause");
		276	SingleLockState onResumeState=map.get("onResume");
		277	if (locking(onResumeState) && (!unlocking(onPauseState))) {
		278	logNote("POSSIBLE BUG(onPause - onResume)");
		279	}
		280	}
		281	if (component.getComponentType().equals("Service")) {
		282	SingleLockState onStartState=getServiceOnStart();
		283	SingleLockState onDestroyState=map.get("onDestroy");
		284	if (locking(onStartState) && (!unlocking(onDestroyState))) {
		285	logNote("STRONG BUG: " + component.toString() + "Locking @ onDestroy");
		286	}
		287	if (weakUnlocking(onDestroyState)) {
		288	logNote("WEAK BUG: " + component.toString() + "Weak UnLocking @ onDestroy");
		289	}
		290	}
		291	if (component.getComponentType().equals("RunnableThread")) {
		292	SingleLockState runState=map.get("run");
		293	if (locking(runState)) {
		294	logNote("WEAK BUG: " + component.toString() + "Locking @ run");
		295	}
		296	}
		297	if (component.getComponentType().equals("BroadcastReceiver")) {
		298	SingleLockState onReceiveState=map.get("onReceive");
		299	if (locking(onReceiveState)) {
		300	logNote("WEAK BUG: " + component.toString() + "Locking @ onReceive");
		301	}
130	}	302	}
131	}	303	}
132	}	304	}
133	}	305	}

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_004 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_005

Modified lines:	1, 3, 273
Added line:	4, 5, 6, 7, 8, 9, 10, 11
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_005 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_006

Modified lines:	1, 286
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_006 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_007

Modified lines:	1, 286
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_007 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_008

Modified lines:	1, 286
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_008 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_009

Modified lines:	1, 286
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_009 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_010

Modified lines:	1, 286
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_010 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_011

Modified lines:	1, 286
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:31 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_011 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_012

Modified lines:	1, 281
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_012 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_013

Modified lines:	1, 8, 277
Added line:	None
Removed line:	5, 6

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_013 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_015

Modified lines:	1, 6
Added line:	5, 8, 10, 284, 285, 286, 287
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_015 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_016

Modified lines:	1, 7, 284
Added line:	5
Removed line:	8, 10

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_016 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_017

Modified lines:	1, 283
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_017 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_018

Modified lines:	1, 283
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_018 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_019

Modified lines:	1, 5, 284
Added line:	None
Removed line:	6

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_019 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_020

Modified lines:	1, 7, 284
Added line:	5
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_020 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_021

Modified lines:	1, 2, 8
Added line:	7, 9, 309, 310, 311, 312, 313, 314
Removed line:	5, 6

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_021 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_022

Modified lines:	1, 6, 309
Added line:	5
Removed line:	7, 9

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_022 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_023

Modified lines:	1, 7, 309
Added line:	5
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_023 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_024

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_024 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_025

Modified lines:	1, 5, 311
Added line:	None
Removed line:	6

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_025 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_026

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_026 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_027

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_027 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_028

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_028 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_029

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_029 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_030

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_030 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_031

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:32 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_031 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_032

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_032 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_033

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_033 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_034

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_034 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_035

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_035 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_036

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_036 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_037

Modified lines:	1, 4, 5, 6, 7, 8, 9, 310
Added line:	10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_037 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_038

Modified lines:	1, 4, 24, 325
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_038 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_039

Modified lines:	1, 4, 5, 6, 7, 8, 9, 325
Added line:	None
Removed line:	10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_039 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_040

Modified lines:	1, 310
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_040 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_041

Modified lines:	1, 309, 310
Added line:	None
Removed line:	4, 5, 6, 7, 8, 9

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_041 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_045

Modified lines:	1, 305
Added line:	4, 5, 6, 7, 8, 9, 10
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_045 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_046

Modified lines:	1, 312
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_046 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_047

Modified lines:	1, 312
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_047 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_048

Modified lines:	1, 312
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_048 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_049

Modified lines:	1, 312
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_049 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_050

Modified lines:	1, 8, 289
Added line:	None
Removed line:	5

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_050 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_051

Modified lines:	1, 288
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_051 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_052

Modified lines:	1, 288
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:33 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_052 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_053

Modified lines:	1, 288
Added line:	None
Removed line:	None

Generated by diff2html
© Yves Bailly, MandrakeSoft S.A. 2001
diff2html is licensed under the GNU GPL.

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_053 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_054

Modified lines:	1, 288
Added line:	None
Removed line:	4, 5, 6, 7, 8, 9

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_054 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_056

Modified lines:	1, 282
Added line:	4, 5, 6, 7, 8, 9
Removed line:	None

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_056 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_057

Modified lines:	1, 5, 7
Added line:	8, 10, 293, 294, 295
Removed line:	None

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_057 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_058

Modified lines:	1, 5, 7, 294
Added line:	6
Removed line:	8, 10

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_058 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_059

Modified lines:	1, 8, 289
Added line:	None
Removed line:	5

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_059 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_060

Modified lines:	1, 288
Added line:	None
Removed line:	None

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_060 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_061

Modified lines:	1, 288
Added line:	None
Removed line:	None

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_061 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_062

Modified lines:	1, 7, 8, 237
Added line:	8
Removed line:	5

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_062 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_063

Modified lines:	1, 8, 243
Added line:	None
Removed line:	None

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_063 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_064

Modified lines:	1, 6, 7, 289
Added line:	5, 6
Removed line:	8

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_064 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_065

Modified lines:	1, 293
Added line:	None
Removed line:	None

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_065 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_066

Modified lines:	1, 8
Added line:	7, 9
Removed line:	5, 6, 273

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_066 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_067

Modified lines:	1, 2, 3, 122, 123, 202, 205, 206, 209, 214, 215, 253, 254, 276, 280, 284, 289, 292, 299, 302, 308, 314, 320
Added line:	75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92
Removed line:	4, 5, 6, 7, 8, 9, 10, 11, 26, 287

	DiffViewer/output/AnalysisResults.java//AnalysisResults.java_067		DiffViewer/output/AnalysisResults.java//AnalysisResults.java_068
	325 lines 12987 bytes Last modified : Mon May 14 23:48:04 2012		333 lines 13323 bytes Last modified : Mon May 14 23:48:11 2012
1	//Time : 2012-04-24 19:43:38.605	1	//Time : 2012-04-26 18:50:13.586
2	//Files Open : /com.ibm.wala.core/src/com/ibm/wala/cfg/ShrikeCFG.java /com.ibm.wala.core/src/com/ibm/wala/cfg/AbstractCFG.java /com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java /com.ibm.wala.core/src/com/ibm/wala/cfg/ControlFlowGraph.java /pvekris/src/main/java/energy/analysis/AnalysisResults.java /com.ibm.wala.core/src/com/ibm/wala/cfg/CFGSanitizer.java /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java	2	//Files Open : /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/ComponentManager.java /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java
3	/*AST Changes :	3	package energy.analysis;
4	CHANGE ClassOrInterfaceDeclaration to ClassOrInterfaceDeclaration = 1
5	CHANGE MethodDeclaration to MethodDeclaration = 1
6	DELETE ExpressionStmt = 1
7	changes = 2
8	changes to method solveFacts = 1
9	deletes = 1
10	private/protected method declarations = 1
11	*/package energy.analysis;
12	import java.util.ArrayList;	4	import java.util.ArrayList;
13	import java.util.HashMap;	5	import java.util.HashMap;
14	import java.util.HashSet;	6	import java.util.HashSet;
15	import java.util.Iterator;	7	import java.util.Iterator;
16	import java.util.Map;	8	import java.util.Map;
17	import java.util.Map.Entry;	9	import java.util.Map.Entry;
18	import java.util.Set;	10	import java.util.Set;
19	import com.ibm.wala.ipa.callgraph.CGNode;	11	import com.ibm.wala.ipa.callgraph.CGNode;
20	import com.ibm.wala.util.collections.Pair;	12	import com.ibm.wala.util.collections.Pair;
21	import energy.analysis.WakeLockManager.WakeLockInstance;	13	import energy.analysis.WakeLockManager.WakeLockInstance;
22	import energy.components.Component;	14	import energy.components.Component;
23	import energy.components.Component.CallBack;	15	import energy.components.Component.CallBack;
24	import energy.interproc.CompoundLockState;	16	import energy.interproc.CompoundLockState;
25	import energy.interproc.SingleLockState;	17	import energy.interproc.SingleLockState;
26	import energy.util.E;
27	public class AnalysisResults {	18	public class AnalysisResults {
28	/**	19	/**
29	* Main structures that hold the analysis results for every component	20	* Main structures that hold the analysis results for every component
30	*/	21	*/
31	private HashSet<Pair<Component,ComponentSummary>> allStates=null;	22	private HashSet<Pair<Component,ComponentSummary>> allStates=null;
32	public class ComponentSummary {	23	public class ComponentSummary {
33	private Component component;	24	private Component component;
34	private HashMap<CallBack,CompoundLockState> callBackExitStates;	25	private HashMap<CallBack,CompoundLockState> callBackExitStates;
35	private HashMap<CGNode,CompoundLockState> allExitStates;	26	private HashMap<CGNode,CompoundLockState> allExitStates;
36	public ComponentSummary( Component c){	27	public ComponentSummary( Component c){
37	this.component=c;	28	this.component=c;
38	allExitStates=new HashMap<CGNode,CompoundLockState>();	29	allExitStates=new HashMap<CGNode,CompoundLockState>();
39	callBackExitStates=new HashMap<Component.CallBack,CompoundLockState>();	30	callBackExitStates=new HashMap<Component.CallBack,CompoundLockState>();
40	}	31	}
41	public HashMap<CGNode,CompoundLockState> getAllExitStates(){	32	public HashMap<CGNode,CompoundLockState> getAllExitStates(){
42	return allExitStates;	33	return allExitStates;
43	}	34	}
44	public void registerNodeState( CGNode n, CompoundLockState st){	35	public void registerNodeState( CGNode n, CompoundLockState st){
45	allExitStates.put(n,st);	36	allExitStates.put(n,st);
46	}	37	}
47	public void registerCallBackState( CallBack cb, CompoundLockState st){	38	public void registerCallBackState( CallBack cb, CompoundLockState st){
48	callBackExitStates.put(cb,st);	39	callBackExitStates.put(cb,st);
49	}	40	}
50	public CompoundLockState getStateForMethod( String method){	41	public CompoundLockState getStateForMethod( String method){
51	return allExitStates.get(method);	42	return allExitStates.get(method);
52	}	43	}
53	public String toString(){	44	public String toString(){
54	StringBuffer sb=new StringBuffer();	45	StringBuffer sb=new StringBuffer();
55	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {	46	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {
56	CGNode next=it.next();	47	CGNode next=it.next();
57	String name=next.getMethod().getName().toString();	48	String name=next.getMethod().getName().toString();
58	CompoundLockState stateForMethod=getStateForMethod(name);	49	CompoundLockState stateForMethod=getStateForMethod(name);
59	if (stateForMethod != null) {	50	if (stateForMethod != null) {
60	sb.append(name + ":\n" + stateForMethod.toString());	51	sb.append(name + ":\n" + stateForMethod.toString());
61	}	52	}
62	}	53	}
63	HashSet<CallBack> callbacks=component.getCallbacks();	54	HashSet<CallBack> callbacks=component.getCallbacks();
64	if (callbacks != null) {	55	if (callbacks != null) {
65	if (callbacks.size() > 0) {	56	if (callbacks.size() > 0) {
66	sb.append("Callbacks:\n");	57	sb.append("Callbacks:\n");
67	for ( CallBack cb : callbacks) {	58	for ( CallBack cb : callbacks) {
68	String name=cb.getName();	59	String name=cb.getName();
69	;	60	;
70	CompoundLockState stateForMethod=getStateForMethod(name);	61	CompoundLockState stateForMethod=getStateForMethod(name);
71	if (stateForMethod != null) {	62	if (stateForMethod != null) {
72	sb.append(" " + name + ":\n"+ stateForMethod.toString());	63	sb.append(" " + name + ":\n"+ stateForMethod.toString());
73	}	64	}
74	}	65	}
75	}	66	}
76	}	67	}
77	return null;	68	return null;
78	}	69	}
79	}	70	}
80	public AnalysisResults(){	71	public AnalysisResults(){
81	allStates=new HashSet<Pair<Component,ComponentSummary>>();	72	allStates=new HashSet<Pair<Component,ComponentSummary>>();
82	}	73	}
83	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}	74	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}
		75	public enum ResultType { UNRESOLVED_INTERESTING_CALLBACKS, LOCKING_ON_CREATE, START_DESTROY, SERVICE_DESTROY, THREAD_RUN, HANDLE_MESSAGE, BROADCAST_RECEIVER_ONRECEIVE, LOCKING_ON_START, LOCKING_ON_RESTART, STRONG_PAUSE_RESUME, WEAK_PAUSE_RESUME, WEAK_SERVICE_DESTROY, STRONG_SERVICE_DESTROY, DID_NOT_PROCESS, OPTIMIZATION_FAILURE, ANALYSIS_FAILURE, UNIMPLEMENTED_FAILURE}
		76	public static class Result {
		77	private ResultType resultType;
		78	private String message;
		79	public ResultType getResultType(){
		80	return resultType;
		81	}
		82	public String getMessage(){
		83	return message;
		84	}
		85	public Result( ResultType rt, String msg){
		86	message=msg;
		87	resultType=rt;
		88	}
		89	public String toString(){
		90	return (resultType.name() + " " + message);
		91	}
		92	}
84	/**	93	/**
85	* Invoke this after the component has been analyzed	94	* Invoke this after the component has been analyzed
86	* @param component	95	* @param component
87	*/	96	*/
88	public void createComponentSummary( Component component){	97	public void createComponentSummary( Component component){
89	ComponentSummary componentSummary=new ComponentSummary(component);	98	ComponentSummary componentSummary=new ComponentSummary(component);
90	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {	99	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {
91	CGNode next=it.next();	100	CGNode next=it.next();
92	Map<WakeLockInstance,Set<SingleLockState>> exitState=component.getExitState(next);	101	Map<WakeLockInstance,Set<SingleLockState>> exitState=component.getExitState(next);
93	if (exitState != null) {	102	if (exitState != null) {
94	CompoundLockState compoundLockState=new CompoundLockState(exitState);	103	CompoundLockState compoundLockState=new CompoundLockState(exitState);
95	componentSummary.registerNodeState(next,compoundLockState);	104	componentSummary.registerNodeState(next,compoundLockState);
96	}	105	}
97	}	106	}
98	allStates.add(Pair.make(component,componentSummary));	107	allStates.add(Pair.make(component,componentSummary));
99	}	108	}
100	private LockUsage getLockUsage( SingleLockState runState){	109	private LockUsage getLockUsage( SingleLockState runState){
101	if (runState != null) {	110	if (runState != null) {
102	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {	111	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {
103	return LockUsage.LOCKING;	112	return LockUsage.LOCKING;
104	}	113	}
105	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	114	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
106	return LockUsage.EMPTY;	115	return LockUsage.EMPTY;
107	}	116	}
108	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	117	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
109	return LockUsage.FULL_UNLOCKING;	118	return LockUsage.FULL_UNLOCKING;
110	}	119	}
111	else if (runState.isMaybeReleased()) {	120	else if (runState.isMaybeReleased()) {
112	return LockUsage.UNLOCKING;	121	return LockUsage.UNLOCKING;
113	}	122	}
114	else {	123	else {
115	return LockUsage.UNKNOWN_STATE;	124	return LockUsage.UNKNOWN_STATE;
116	}	125	}
117	}	126	}
118	else {	127	else {
119	return LockUsage.EMPTY;	128	return LockUsage.EMPTY;
120	}	129	}
121	}	130	}
122	public ArrayList<String> processResults(){	131	public ArrayList<Result> processResults(){
123	ArrayList<String> result=null;	132	ArrayList<Result> result=new ArrayList<Result>();
124	System.out.println("\n==========================================");	133	System.out.println("\n==========================================");
125	HashMap<LockUsage,Set<Pair<Component,CGNode>>> usageMap=new HashMap<LockUsage,Set<Pair<Component,CGNode>>>();	134	HashMap<LockUsage,Set<Pair<Component,CGNode>>> usageMap=new HashMap<LockUsage,Set<Pair<Component,CGNode>>>();
126	HashMap<Component,Logger> componentMap=new HashMap<Component,Logger>();	135	HashMap<Component,Logger> componentMap=new HashMap<Component,Logger>();
127	for ( Pair<Component,ComponentSummary> pair : allStates) {	136	for ( Pair<Component,ComponentSummary> pair : allStates) {
128	Component component=pair.fst;	137	Component component=pair.fst;
129	ComponentSummary cSummary=pair.snd;	138	ComponentSummary cSummary=pair.snd;
130	ComponentPolicy policy=new ComponentPolicy(component);	139	ComponentPolicy policy=new ComponentPolicy(component);
131	StringBuffer sb=new StringBuffer();	140	StringBuffer sb=new StringBuffer();
132	boolean printComponent=false;	141	boolean printComponent=false;
133	for ( Entry<CGNode,CompoundLockState> e : cSummary.getAllExitStates().entrySet()) {	142	for ( Entry<CGNode,CompoundLockState> e : cSummary.getAllExitStates().entrySet()) {
134	CGNode node=e.getKey();	143	CGNode node=e.getKey();
135	HashMap<WakeLockInstance,LockUsage> lockUsages=new HashMap<WakeLockInstance,LockUsage>();	144	HashMap<WakeLockInstance,LockUsage> lockUsages=new HashMap<WakeLockInstance,LockUsage>();
136	boolean printMethod=false;	145	boolean printMethod=false;
137	LockUsage lockUsage=LockUsage.EMPTY;	146	LockUsage lockUsage=LockUsage.EMPTY;
138	CompoundLockState compLS=e.getValue();	147	CompoundLockState compLS=e.getValue();
139	Map<WakeLockInstance,Set<SingleLockState>> allLockStates=compLS.getAllLockStates();	148	Map<WakeLockInstance,Set<SingleLockState>> allLockStates=compLS.getAllLockStates();
140	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : allLockStates.entrySet()) {	149	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : allLockStates.entrySet()) {
141	WakeLockInstance wli=fs.getKey();	150	WakeLockInstance wli=fs.getKey();
142	Set<SingleLockState> sls=fs.getValue();	151	Set<SingleLockState> sls=fs.getValue();
143	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);	152	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);
144	lockUsage=getLockUsage(sl);	153	lockUsage=getLockUsage(sl);
145	lockUsages.put(wli,lockUsage);	154	lockUsages.put(wli,lockUsage);
146	if (lockUsage != LockUsage.EMPTY) {	155	if (lockUsage != LockUsage.EMPTY) {
147	printMethod=true;	156	printMethod=true;
148	}	157	}
149	}	158	}
150	if (printMethod) {	159	if (printMethod) {
151	if (Opts.OUTPUT_ALL_NODE_INFO \|\| component.isCallBack(node)) {	160	if (Opts.OUTPUT_ALL_NODE_INFO \|\| component.isCallBack(node)) {
152	printComponent=true;	161	printComponent=true;
153	HashSet<SingleLockState> tempState=new HashSet<SingleLockState>();	162	HashSet<SingleLockState> tempState=new HashSet<SingleLockState>();
154	sb.append(" " + node.getMethod().getSignature().toString() + "\n");	163	sb.append(" " + node.getMethod().getSignature().toString() + "\n");
155	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : compLS.getAllLockStates().entrySet()) {	164	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : compLS.getAllLockStates().entrySet()) {
156	WakeLockInstance key=fs.getKey();	165	WakeLockInstance key=fs.getKey();
157	Set<SingleLockState> value=fs.getValue();	166	Set<SingleLockState> value=fs.getValue();
158	tempState.add(SingleLockState.mergeSingleLockStates(value));	167	tempState.add(SingleLockState.mergeSingleLockStates(value));
159	sb.append("\t" + key.toString() + "\n\t"+ value.toString()+ "\n");	168	sb.append("\t" + key.toString() + "\n\t"+ value.toString()+ "\n");
160	}	169	}
161	SingleLockState mergedLS=SingleLockState.mergeSingleLockStates(tempState);	170	SingleLockState mergedLS=SingleLockState.mergeSingleLockStates(tempState);
162	LockUsage lu=getLockUsage(mergedLS);	171	LockUsage lu=getLockUsage(mergedLS);
163	if (component.isCallBack(node)) {	172	if (component.isCallBack(node)) {
164	if (usageMap.containsKey(lu)) {	173	if (usageMap.containsKey(lu)) {
165	usageMap.get(lu).add(Pair.make(component,node));	174	usageMap.get(lu).add(Pair.make(component,node));
166	}	175	}
167	else {	176	else {
168	HashSet<Pair<Component,CGNode>> set=new HashSet<Pair<Component,CGNode>>();	177	HashSet<Pair<Component,CGNode>> set=new HashSet<Pair<Component,CGNode>>();
169	set.add(Pair.make(component,node));	178	set.add(Pair.make(component,node));
170	usageMap.put(lu,set);	179	usageMap.put(lu,set);
171	}	180	}
172	policy.addFact(node,mergedLS);	181	policy.addFact(node,mergedLS);
173	}	182	}
174	}	183	}
175	}	184	}
176	}	185	}
177	if (printComponent) {	186	if (printComponent) {
178	System.out.println(component.toString() + "\n" + sb.toString());	187	System.out.println(component.toString() + "\n" + sb.toString());
179	policy.solveFacts();	188	policy.solveFacts();
180	componentMap.put(component,policy.getLogger());	189	componentMap.put(component,policy.getLogger());
181	}	190	}
182	}	191	}
183	System.out.println("==========================================\n");	192	System.out.println("==========================================\n");
184	for ( LockUsage e : usageMap.keySet()) {	193	for ( LockUsage e : usageMap.keySet()) {
185	System.out.println(e.toString());	194	System.out.println(e.toString());
186	for ( Pair<Component,CGNode> s : usageMap.get(e)) {	195	for ( Pair<Component,CGNode> s : usageMap.get(e)) {
187	System.out.println(" " + s.toString());	196	System.out.println(" " + s.toString());
188	}	197	}
189	}	198	}
190	System.out.println("==========================================\n");	199	System.out.println("==========================================\n");
191	for ( Component e : componentMap.keySet()) {	200	for ( Component e : componentMap.keySet()) {
192	Logger logger=componentMap.get(e);	201	Logger logger=componentMap.get(e);
193	if (!logger.isEmpty()) {	202	if (!logger.isEmpty()) {
194	System.out.println(e.toString());	203	System.out.println(e.toString());
195	System.out.println(logger.toString());	204	System.out.println(logger.toString());
196	System.out.println("\n");	205	System.out.println("\n");
197	}	206	}
198	result=logger.getStringList();	207	result=logger.getStringList();
199	}	208	}
200	return result;	209	return result;
201	}	210	}
202	public class Logger extends ArrayList<String> {	211	public class Logger extends ArrayList<Result> {
203	private static final long serialVersionUID=4402714524487791090L;	212	private static final long serialVersionUID=4402714524487791090L;
204	public void output(){	213	public void output(){
205	for ( String s : this) {	214	for ( Result r : this) {
206	System.out.println(" " + s);	215	System.out.println(" " + r.getResultType().toString());
207	}	216	}
208	}	217	}
209	public ArrayList<String> getStringList(){	218	public ArrayList<Result> getStringList(){
210	return this;	219	return this;
211	}	220	}
212	public String toString(){	221	public String toString(){
213	StringBuffer result=new StringBuffer();	222	StringBuffer result=new StringBuffer();
214	for ( String s : this) {	223	for ( Result r : this) {
215	result.append(s + "\n");	224	result.append(r.toString() + "\n");
216	}	225	}
217	return result.toString();	226	return result.toString();
218	}	227	}
219	}	228	}
220	public class ComponentPolicy {	229	public class ComponentPolicy {
221	private Component component;	230	private Component component;
222	public ComponentPolicy( Component component){	231	public ComponentPolicy( Component component){
223	this.component=component;	232	this.component=component;
224	map=new HashMap<String,SingleLockState>();	233	map=new HashMap<String,SingleLockState>();
225	logger=new Logger();	234	logger=new Logger();
226	}	235	}
227	private HashMap<String,SingleLockState> map;	236	private HashMap<String,SingleLockState> map;
228	public void addFact( CGNode n, SingleLockState st){	237	public void addFact( CGNode n, SingleLockState st){
229	map.put(n.getMethod().getName().toString(),st);	238	map.put(n.getMethod().getName().toString(),st);
230	}	239	}
231	private boolean unlocking( SingleLockState state){	240	private boolean unlocking( SingleLockState state){
232	return (strongUnlocking(state) \|\| weakUnlocking(state));	241	return (strongUnlocking(state) \|\| weakUnlocking(state));
233	}	242	}
234	private boolean strongUnlocking( SingleLockState state){	243	private boolean strongUnlocking( SingleLockState state){
235	if (state != null) {	244	if (state != null) {
236	return (getLockUsage(state).equals(LockUsage.FULL_UNLOCKING));	245	return (getLockUsage(state).equals(LockUsage.FULL_UNLOCKING));
237	}	246	}
238	return true;	247	return true;
239	}	248	}
240	private boolean weakUnlocking( SingleLockState state){	249	private boolean weakUnlocking( SingleLockState state){
241	if (state != null) {	250	if (state != null) {
242	return (getLockUsage(state).equals(LockUsage.UNLOCKING));	251	return (getLockUsage(state).equals(LockUsage.UNLOCKING));
243	}	252	}
244	return true;	253	return true;
245	}	254	}
246	private boolean locking( SingleLockState onCreateState){	255	private boolean locking( SingleLockState onCreateState){
247	if (onCreateState != null) {	256	if (onCreateState != null) {
248	return (getLockUsage(onCreateState).equals(LockUsage.LOCKING));	257	return (getLockUsage(onCreateState).equals(LockUsage.LOCKING));
249	}	258	}
250	return false;	259	return false;
251	}	260	}
252	private Logger logger;	261	private Logger logger;
253	private void logNote( String s){	262	private void logNote( Result result){
254	logger.add(s);	263	logger.add(result);
255	}	264	}
256	public Logger getLogger(){	265	public Logger getLogger(){
257	return logger;	266	return logger;
258	}	267	}
259	private SingleLockState getServiceOnStart(){	268	private SingleLockState getServiceOnStart(){
260	SingleLockState onStart=map.get("onStart");	269	SingleLockState onStart=map.get("onStart");
261	SingleLockState onStartCommand=map.get("onStartCommand");	270	SingleLockState onStartCommand=map.get("onStartCommand");
262	if (onStartCommand == null) {	271	if (onStartCommand == null) {
263	return onStart;	272	return onStart;
264	}	273	}
265	else {	274	else {
266	return onStartCommand;	275	return onStartCommand;
267	}	276	}
268	}	277	}
269	/**	278	/**
270	* TODO: make sure the same lock is locked and unlocked...	279	* TODO: make sure the same lock is locked and unlocked...
271	*/	280	*/
272	public void solveFacts(){	281	public void solveFacts(){
273	if (component.getComponentType().equals("Activity")) {	282	if (component.getComponentType().equals("Activity")) {
274	SingleLockState onCreateState=map.get("onCreate");	283	SingleLockState onCreateState=map.get("onCreate");
275	if (locking(onCreateState)) {	284	if (locking(onCreateState)) {
276	logNote("STRONG BUG: Locking @ onCreate (" + component.toString() + ")");	285	logNote(new Result(ResultType.LOCKING_ON_CREATE,component.toString()));
277	}	286	}
278	SingleLockState onStartState=map.get("onStart");	287	SingleLockState onStartState=map.get("onStart");
279	if (locking(onStartState)) {	288	if (locking(onStartState)) {
280	logNote("STRONG BUG: Locking @ onStart (" + component.toString() + ")");	289	logNote(new Result(ResultType.LOCKING_ON_START,component.toString()));
281	}	290	}
282	SingleLockState onRestartState=map.get("onRestart");	291	SingleLockState onRestartState=map.get("onRestart");
283	if (locking(onRestartState)) {	292	if (locking(onRestartState)) {
284	logNote("STRONG BUG: Locking @ onRestart (" + component.toString() + ")");	293	logNote(new Result(ResultType.LOCKING_ON_RESTART,component.toString()));
285	}	294	}
286	SingleLockState onPauseState=map.get("onPause");	295	SingleLockState onPauseState=map.get("onPause");
287	SingleLockState onResumeState=map.get("onResume");
288	if (!unlocking(onPauseState)) {	296	if (!unlocking(onPauseState)) {
289	logNote("STRONG BUG: onPause (" + component.toString() + ")");	297	logNote(new Result(ResultType.STRONG_PAUSE_RESUME,component.toString()));
290	}	298	}
291	if (weakUnlocking(onPauseState) && (!strongUnlocking(onPauseState))) {	299	if (weakUnlocking(onPauseState) && (!strongUnlocking(onPauseState))) {
292	logNote("WEAK BUG: onPause (" + component.toString() + ")");	300	logNote(new Result(ResultType.WEAK_PAUSE_RESUME,component.toString()));
293	}	301	}
294	}	302	}
295	if (component.getComponentType().equals("Service")) {	303	if (component.getComponentType().equals("Service")) {
296	SingleLockState onStartState=getServiceOnStart();	304	SingleLockState onStartState=getServiceOnStart();
297	SingleLockState onDestroyState=map.get("onDestroy");	305	SingleLockState onDestroyState=map.get("onDestroy");
298	if (locking(onStartState) && (!unlocking(onDestroyState))) {	306	if (locking(onStartState) && (!unlocking(onDestroyState))) {
299	logNote("STRONG BUG: " + component.toString() + "Locking @ onDestroy");	307	logNote(new Result(ResultType.STRONG_SERVICE_DESTROY,component.toString()));
300	}	308	}
301	if (weakUnlocking(onDestroyState)) {	309	if (weakUnlocking(onDestroyState)) {
302	logNote("WEAK BUG: " + component.toString() + "Weak UnLocking @ onDestroy");	310	logNote(new Result(ResultType.WEAK_SERVICE_DESTROY,component.toString()));
303	}	311	}
304	}	312	}
305	if (component.getComponentType().equals("RunnableThread")) {	313	if (component.getComponentType().equals("RunnableThread")) {
306	SingleLockState runState=map.get("run");	314	SingleLockState runState=map.get("run");
307	if (locking(runState)) {	315	if (locking(runState)) {
308	logNote("WEAK BUG: " + component.toString() + "Locking @ run");	316	logNote(new Result(ResultType.THREAD_RUN,component.toString()));
309	}	317	}
310	}	318	}
311	if (component.getComponentType().equals("Handler")) {	319	if (component.getComponentType().equals("Handler")) {
312	SingleLockState handleState=map.get("handleMessage");	320	SingleLockState handleState=map.get("handleMessage");
313	if (unlocking(handleState) && (!strongUnlocking(handleState))) {	321	if (unlocking(handleState) && (!strongUnlocking(handleState))) {
314	logNote("WEAK BUG: " + component.toString() + "Not full unlocking @ handleMessage");	322	logNote(new Result(ResultType.WEAK_SERVICE_DESTROY,component.toString()));
315	}	323	}
316	}	324	}
317	if (component.getComponentType().equals("BroadcastReceiver")) {	325	if (component.getComponentType().equals("BroadcastReceiver")) {
318	SingleLockState onReceiveState=map.get("onReceive");	326	SingleLockState onReceiveState=map.get("onReceive");
319	if (locking(onReceiveState)) {	327	if (locking(onReceiveState)) {
320	logNote("WEAK BUG: " + component.toString() + "Locking @ onReceive");	328	logNote(new Result(ResultType.BROADCAST_RECEIVER_ONRECEIVE,component.toString()));
321	}	329	}
322	}	330	}
323	}	331	}
324	}	332	}
325	}	333	}

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_067 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_068

Modified lines:	1, 2, 3, 253
Added line:	4, 5, 6, 7, 8, 9, 10
Removed line:	None

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_068 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_069

Modified lines:	1, 260
Added line:	None
Removed line:	None

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_069 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_070

Modified lines:	1, 8, 310, 311, 312, 313
Added line:	5
Removed line:	6, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336

	DiffViewer/output/AnalysisResults.java//AnalysisResults.java_070		DiffViewer/output/AnalysisResults.java//AnalysisResults.java_071
	340 lines 13642 bytes Last modified : Mon May 14 23:48:12 2012		317 lines 12643 bytes Last modified : Mon May 14 23:48:12 2012
1	//Time : 2012-04-26 20:49:20.139	1	//Time : 2012-04-26 20:49:37.253
2	//Files Open : /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/ComponentManager.java /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java	2	//Files Open : /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/ComponentManager.java /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java
3	/*AST Changes :	3	/*AST Changes :
4	CHANGE ClassOrInterfaceDeclaration to ClassOrInterfaceDeclaration = 1	4	CHANGE ClassOrInterfaceDeclaration to ClassOrInterfaceDeclaration = 1
		5	CHANGE ExpressionStmt ExpressionStmt IfStmt to IfStmt IfStmt IfStmt IfStmt = 1
5	CHANGE MethodDeclaration to MethodDeclaration = 1	6	CHANGE MethodDeclaration to MethodDeclaration = 1
6	CHANGE ReturnStmt to ReturnStmt = 1
7	changes = 3	7	changes = 3
8	changes to method weakUnlocking = 1	8	changes to method solveFacts = 1
9	private/protected method declarations = 1	9	private/protected method declarations = 1
10	*/package energy.analysis;	10	*/package energy.analysis;
11	import java.util.ArrayList;	11	import java.util.ArrayList;
12	import java.util.HashMap;	12	import java.util.HashMap;
13	import java.util.HashSet;	13	import java.util.HashSet;
14	import java.util.Iterator;	14	import java.util.Iterator;
15	import java.util.Map;	15	import java.util.Map;
16	import java.util.Map.Entry;	16	import java.util.Map.Entry;
17	import java.util.Set;	17	import java.util.Set;
18	import com.ibm.wala.ipa.callgraph.CGNode;	18	import com.ibm.wala.ipa.callgraph.CGNode;
19	import com.ibm.wala.util.collections.Pair;	19	import com.ibm.wala.util.collections.Pair;
20	import energy.analysis.WakeLockManager.WakeLockInstance;	20	import energy.analysis.WakeLockManager.WakeLockInstance;
21	import energy.components.Component;	21	import energy.components.Component;
22	import energy.components.Component.CallBack;	22	import energy.components.Component.CallBack;
23	import energy.interproc.CompoundLockState;	23	import energy.interproc.CompoundLockState;
24	import energy.interproc.SingleLockState;	24	import energy.interproc.SingleLockState;
25	public class AnalysisResults {	25	public class AnalysisResults {
26	/**	26	/**
27	* Main structures that hold the analysis results for every component	27	* Main structures that hold the analysis results for every component
28	*/	28	*/
29	private HashSet<Pair<Component,ComponentSummary>> allStates=null;	29	private HashSet<Pair<Component,ComponentSummary>> allStates=null;
30	public class ComponentSummary {	30	public class ComponentSummary {
31	private Component component;	31	private Component component;
32	private HashMap<CallBack,CompoundLockState> callBackExitStates;	32	private HashMap<CallBack,CompoundLockState> callBackExitStates;
33	private HashMap<CGNode,CompoundLockState> allExitStates;	33	private HashMap<CGNode,CompoundLockState> allExitStates;
34	public ComponentSummary( Component c){	34	public ComponentSummary( Component c){
35	this.component=c;	35	this.component=c;
36	allExitStates=new HashMap<CGNode,CompoundLockState>();	36	allExitStates=new HashMap<CGNode,CompoundLockState>();
37	callBackExitStates=new HashMap<Component.CallBack,CompoundLockState>();	37	callBackExitStates=new HashMap<Component.CallBack,CompoundLockState>();
38	}	38	}
39	public HashMap<CGNode,CompoundLockState> getAllExitStates(){	39	public HashMap<CGNode,CompoundLockState> getAllExitStates(){
40	return allExitStates;	40	return allExitStates;
41	}	41	}
42	public void registerNodeState( CGNode n, CompoundLockState st){	42	public void registerNodeState( CGNode n, CompoundLockState st){
43	allExitStates.put(n,st);	43	allExitStates.put(n,st);
44	}	44	}
45	public void registerCallBackState( CallBack cb, CompoundLockState st){	45	public void registerCallBackState( CallBack cb, CompoundLockState st){
46	callBackExitStates.put(cb,st);	46	callBackExitStates.put(cb,st);
47	}	47	}
48	public CompoundLockState getStateForMethod( String method){	48	public CompoundLockState getStateForMethod( String method){
49	return allExitStates.get(method);	49	return allExitStates.get(method);
50	}	50	}
51	public String toString(){	51	public String toString(){
52	StringBuffer sb=new StringBuffer();	52	StringBuffer sb=new StringBuffer();
53	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {	53	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {
54	CGNode next=it.next();	54	CGNode next=it.next();
55	String name=next.getMethod().getName().toString();	55	String name=next.getMethod().getName().toString();
56	CompoundLockState stateForMethod=getStateForMethod(name);	56	CompoundLockState stateForMethod=getStateForMethod(name);
57	if (stateForMethod != null) {	57	if (stateForMethod != null) {
58	sb.append(name + ":\n" + stateForMethod.toString());	58	sb.append(name + ":\n" + stateForMethod.toString());
59	}	59	}
60	}	60	}
61	HashSet<CallBack> callbacks=component.getCallbacks();	61	HashSet<CallBack> callbacks=component.getCallbacks();
62	if (callbacks != null) {	62	if (callbacks != null) {
63	if (callbacks.size() > 0) {	63	if (callbacks.size() > 0) {
64	sb.append("Callbacks:\n");	64	sb.append("Callbacks:\n");
65	for ( CallBack cb : callbacks) {	65	for ( CallBack cb : callbacks) {
66	String name=cb.getName();	66	String name=cb.getName();
67	;	67	;
68	CompoundLockState stateForMethod=getStateForMethod(name);	68	CompoundLockState stateForMethod=getStateForMethod(name);
69	if (stateForMethod != null) {	69	if (stateForMethod != null) {
70	sb.append(" " + name + ":\n"+ stateForMethod.toString());	70	sb.append(" " + name + ":\n"+ stateForMethod.toString());
71	}	71	}
72	}	72	}
73	}	73	}
74	}	74	}
75	return null;	75	return null;
76	}	76	}
77	}	77	}
78	public AnalysisResults(){	78	public AnalysisResults(){
79	allStates=new HashSet<Pair<Component,ComponentSummary>>();	79	allStates=new HashSet<Pair<Component,ComponentSummary>>();
80	}	80	}
81	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}	81	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}
82	public enum ResultType { UNRESOLVED_INTERESTING_CALLBACKS, LOCKING_ON_CREATE, START_DESTROY, SERVICE_DESTROY, THREAD_RUN, HANDLE_MESSAGE, BROADCAST_RECEIVER_ONRECEIVE, LOCKING_ON_START, LOCKING_ON_RESTART, STRONG_PAUSE_RESUME, WEAK_PAUSE_RESUME, WEAK_SERVICE_DESTROY, STRONG_SERVICE_DESTROY, DID_NOT_PROCESS, OPTIMIZATION_FAILURE, ANALYSIS_FAILURE, UNIMPLEMENTED_FAILURE}	82	public enum ResultType { UNRESOLVED_INTERESTING_CALLBACKS, LOCKING_ON_CREATE, START_DESTROY, SERVICE_DESTROY, THREAD_RUN, HANDLE_MESSAGE, BROADCAST_RECEIVER_ONRECEIVE, LOCKING_ON_START, LOCKING_ON_RESTART, STRONG_PAUSE_RESUME, WEAK_PAUSE_RESUME, WEAK_SERVICE_DESTROY, STRONG_SERVICE_DESTROY, DID_NOT_PROCESS, OPTIMIZATION_FAILURE, ANALYSIS_FAILURE, UNIMPLEMENTED_FAILURE}
83	public static class Result {	83	public static class Result {
84	private ResultType resultType;	84	private ResultType resultType;
85	private String message;	85	private String message;
86	public ResultType getResultType(){	86	public ResultType getResultType(){
87	return resultType;	87	return resultType;
88	}	88	}
89	public String getMessage(){	89	public String getMessage(){
90	return message;	90	return message;
91	}	91	}
92	public Result( ResultType rt, String msg){	92	public Result( ResultType rt, String msg){
93	message=msg;	93	message=msg;
94	resultType=rt;	94	resultType=rt;
95	}	95	}
96	public String toString(){	96	public String toString(){
97	return (resultType.name() + " " + message);	97	return (resultType.name() + " " + message);
98	}	98	}
99	}	99	}
100	/**	100	/**
101	* Invoke this after the component has been analyzed	101	* Invoke this after the component has been analyzed
102	* @param component	102	* @param component
103	*/	103	*/
104	public void createComponentSummary( Component component){	104	public void createComponentSummary( Component component){
105	ComponentSummary componentSummary=new ComponentSummary(component);	105	ComponentSummary componentSummary=new ComponentSummary(component);
106	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {	106	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {
107	CGNode next=it.next();	107	CGNode next=it.next();
108	Map<WakeLockInstance,Set<SingleLockState>> exitState=component.getExitState(next);	108	Map<WakeLockInstance,Set<SingleLockState>> exitState=component.getExitState(next);
109	if (exitState != null) {	109	if (exitState != null) {
110	CompoundLockState compoundLockState=new CompoundLockState(exitState);	110	CompoundLockState compoundLockState=new CompoundLockState(exitState);
111	componentSummary.registerNodeState(next,compoundLockState);	111	componentSummary.registerNodeState(next,compoundLockState);
112	}	112	}
113	}	113	}
114	allStates.add(Pair.make(component,componentSummary));	114	allStates.add(Pair.make(component,componentSummary));
115	}	115	}
116	private LockUsage getLockUsage( SingleLockState runState){	116	private LockUsage getLockUsage( SingleLockState runState){
117	if (runState != null) {	117	if (runState != null) {
118	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {	118	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {
119	return LockUsage.LOCKING;	119	return LockUsage.LOCKING;
120	}	120	}
121	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	121	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
122	return LockUsage.EMPTY;	122	return LockUsage.EMPTY;
123	}	123	}
124	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	124	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
125	return LockUsage.FULL_UNLOCKING;	125	return LockUsage.FULL_UNLOCKING;
126	}	126	}
127	else if (runState.isMaybeReleased()) {	127	else if (runState.isMaybeReleased()) {
128	return LockUsage.UNLOCKING;	128	return LockUsage.UNLOCKING;
129	}	129	}
130	else {	130	else {
131	return LockUsage.UNKNOWN_STATE;	131	return LockUsage.UNKNOWN_STATE;
132	}	132	}
133	}	133	}
134	else {	134	else {
135	return LockUsage.EMPTY;	135	return LockUsage.EMPTY;
136	}	136	}
137	}	137	}
138	public ArrayList<Result> processResults(){	138	public ArrayList<Result> processResults(){
139	ArrayList<Result> result=new ArrayList<Result>();	139	ArrayList<Result> result=new ArrayList<Result>();
140	System.out.println("\n==========================================");	140	System.out.println("\n==========================================");
141	HashMap<LockUsage,Set<Pair<Component,CGNode>>> usageMap=new HashMap<LockUsage,Set<Pair<Component,CGNode>>>();	141	HashMap<LockUsage,Set<Pair<Component,CGNode>>> usageMap=new HashMap<LockUsage,Set<Pair<Component,CGNode>>>();
142	HashMap<Component,Logger> componentMap=new HashMap<Component,Logger>();	142	HashMap<Component,Logger> componentMap=new HashMap<Component,Logger>();
143	for ( Pair<Component,ComponentSummary> pair : allStates) {	143	for ( Pair<Component,ComponentSummary> pair : allStates) {
144	Component component=pair.fst;	144	Component component=pair.fst;
145	ComponentSummary cSummary=pair.snd;	145	ComponentSummary cSummary=pair.snd;
146	ComponentPolicy policy=new ComponentPolicy(component);	146	ComponentPolicy policy=new ComponentPolicy(component);
147	StringBuffer sb=new StringBuffer();	147	StringBuffer sb=new StringBuffer();
148	boolean printComponent=false;	148	boolean printComponent=false;
149	for ( Entry<CGNode,CompoundLockState> e : cSummary.getAllExitStates().entrySet()) {	149	for ( Entry<CGNode,CompoundLockState> e : cSummary.getAllExitStates().entrySet()) {
150	CGNode node=e.getKey();	150	CGNode node=e.getKey();
151	HashMap<WakeLockInstance,LockUsage> lockUsages=new HashMap<WakeLockInstance,LockUsage>();	151	HashMap<WakeLockInstance,LockUsage> lockUsages=new HashMap<WakeLockInstance,LockUsage>();
152	boolean printMethod=false;	152	boolean printMethod=false;
153	LockUsage lockUsage=LockUsage.EMPTY;	153	LockUsage lockUsage=LockUsage.EMPTY;
154	CompoundLockState compLS=e.getValue();	154	CompoundLockState compLS=e.getValue();
155	Map<WakeLockInstance,Set<SingleLockState>> allLockStates=compLS.getAllLockStates();	155	Map<WakeLockInstance,Set<SingleLockState>> allLockStates=compLS.getAllLockStates();
156	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : allLockStates.entrySet()) {	156	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : allLockStates.entrySet()) {
157	WakeLockInstance wli=fs.getKey();	157	WakeLockInstance wli=fs.getKey();
158	Set<SingleLockState> sls=fs.getValue();	158	Set<SingleLockState> sls=fs.getValue();
159	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);	159	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);
160	lockUsage=getLockUsage(sl);	160	lockUsage=getLockUsage(sl);
161	lockUsages.put(wli,lockUsage);	161	lockUsages.put(wli,lockUsage);
162	if (lockUsage != LockUsage.EMPTY) {	162	if (lockUsage != LockUsage.EMPTY) {
163	printMethod=true;	163	printMethod=true;
164	}	164	}
165	}	165	}
166	if (printMethod) {	166	if (printMethod) {
167	if (Opts.OUTPUT_ALL_NODE_INFO \|\| component.isCallBack(node)) {	167	if (Opts.OUTPUT_ALL_NODE_INFO \|\| component.isCallBack(node)) {
168	printComponent=true;	168	printComponent=true;
169	HashSet<SingleLockState> tempState=new HashSet<SingleLockState>();	169	HashSet<SingleLockState> tempState=new HashSet<SingleLockState>();
170	sb.append(" " + node.getMethod().getSignature().toString() + "\n");	170	sb.append(" " + node.getMethod().getSignature().toString() + "\n");
171	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : compLS.getAllLockStates().entrySet()) {	171	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : compLS.getAllLockStates().entrySet()) {
172	WakeLockInstance key=fs.getKey();	172	WakeLockInstance key=fs.getKey();
173	Set<SingleLockState> value=fs.getValue();	173	Set<SingleLockState> value=fs.getValue();
174	tempState.add(SingleLockState.mergeSingleLockStates(value));	174	tempState.add(SingleLockState.mergeSingleLockStates(value));
175	sb.append("\t" + key.toString() + "\n\t"+ value.toString()+ "\n");	175	sb.append("\t" + key.toString() + "\n\t"+ value.toString()+ "\n");
176	}	176	}
177	SingleLockState mergedLS=SingleLockState.mergeSingleLockStates(tempState);	177	SingleLockState mergedLS=SingleLockState.mergeSingleLockStates(tempState);
178	LockUsage lu=getLockUsage(mergedLS);	178	LockUsage lu=getLockUsage(mergedLS);
179	if (component.isCallBack(node)) {	179	if (component.isCallBack(node)) {
180	if (usageMap.containsKey(lu)) {	180	if (usageMap.containsKey(lu)) {
181	usageMap.get(lu).add(Pair.make(component,node));	181	usageMap.get(lu).add(Pair.make(component,node));
182	}	182	}
183	else {	183	else {
184	HashSet<Pair<Component,CGNode>> set=new HashSet<Pair<Component,CGNode>>();	184	HashSet<Pair<Component,CGNode>> set=new HashSet<Pair<Component,CGNode>>();
185	set.add(Pair.make(component,node));	185	set.add(Pair.make(component,node));
186	usageMap.put(lu,set);	186	usageMap.put(lu,set);
187	}	187	}
188	policy.addFact(node,mergedLS);	188	policy.addFact(node,mergedLS);
189	}	189	}
190	}	190	}
191	}	191	}
192	}	192	}
193	if (printComponent) {	193	if (printComponent) {
194	System.out.println(component.toString() + "\n" + sb.toString());	194	System.out.println(component.toString() + "\n" + sb.toString());
195	policy.solveFacts();	195	policy.solveFacts();
196	componentMap.put(component,policy.getLogger());	196	componentMap.put(component,policy.getLogger());
197	}	197	}
198	}	198	}
199	System.out.println("==========================================\n");	199	System.out.println("==========================================\n");
200	for ( LockUsage e : usageMap.keySet()) {	200	for ( LockUsage e : usageMap.keySet()) {
201	System.out.println(e.toString());	201	System.out.println(e.toString());
202	for ( Pair<Component,CGNode> s : usageMap.get(e)) {	202	for ( Pair<Component,CGNode> s : usageMap.get(e)) {
203	System.out.println(" " + s.toString());	203	System.out.println(" " + s.toString());
204	}	204	}
205	}	205	}
206	System.out.println("==========================================\n");	206	System.out.println("==========================================\n");
207	for ( Component e : componentMap.keySet()) {	207	for ( Component e : componentMap.keySet()) {
208	Logger logger=componentMap.get(e);	208	Logger logger=componentMap.get(e);
209	if (!logger.isEmpty()) {	209	if (!logger.isEmpty()) {
210	System.out.println(e.toString());	210	System.out.println(e.toString());
211	System.out.println(logger.toString());	211	System.out.println(logger.toString());
212	System.out.println("\n");	212	System.out.println("\n");
213	}	213	}
214	result=logger.getStringList();	214	result=logger.getStringList();
215	}	215	}
216	return result;	216	return result;
217	}	217	}
218	public class Logger extends ArrayList<Result> {	218	public class Logger extends ArrayList<Result> {
219	private static final long serialVersionUID=4402714524487791090L;	219	private static final long serialVersionUID=4402714524487791090L;
220	public void output(){	220	public void output(){
221	for ( Result r : this) {	221	for ( Result r : this) {
222	System.out.println(" " + r.getResultType().toString());	222	System.out.println(" " + r.getResultType().toString());
223	}	223	}
224	}	224	}
225	public ArrayList<Result> getStringList(){	225	public ArrayList<Result> getStringList(){
226	return this;	226	return this;
227	}	227	}
228	public String toString(){	228	public String toString(){
229	StringBuffer result=new StringBuffer();	229	StringBuffer result=new StringBuffer();
230	for ( Result r : this) {	230	for ( Result r : this) {
231	result.append(r.toString() + "\n");	231	result.append(r.toString() + "\n");
232	}	232	}
233	return result.toString();	233	return result.toString();
234	}	234	}
235	}	235	}
236	public class ComponentPolicy {	236	public class ComponentPolicy {
237	private Component component;	237	private Component component;
238	public ComponentPolicy( Component component){	238	public ComponentPolicy( Component component){
239	this.component=component;	239	this.component=component;
240	map=new HashMap<String,SingleLockState>();	240	map=new HashMap<String,SingleLockState>();
241	logger=new Logger();	241	logger=new Logger();
242	}	242	}
243	private HashMap<String,SingleLockState> map;	243	private HashMap<String,SingleLockState> map;
244	public void addFact( CGNode n, SingleLockState st){	244	public void addFact( CGNode n, SingleLockState st){
245	map.put(n.getMethod().getName().toString(),st);	245	map.put(n.getMethod().getName().toString(),st);
246	}	246	}
247	private boolean unlocking( SingleLockState state){	247	private boolean unlocking( SingleLockState state){
248	return (strongUnlocking(state) \|\| weakUnlocking(state));	248	return (strongUnlocking(state) \|\| weakUnlocking(state));
249	}	249	}
250	private boolean strongUnlocking( SingleLockState state){	250	private boolean strongUnlocking( SingleLockState state){
251	if (state != null) {	251	if (state != null) {
252	return (getLockUsage(state).equals(LockUsage.FULL_UNLOCKING));	252	return (getLockUsage(state).equals(LockUsage.FULL_UNLOCKING));
253	}	253	}
254	return true;	254	return true;
255	}	255	}
256	private boolean weakUnlocking( SingleLockState state){	256	private boolean weakUnlocking( SingleLockState state){
257	if (state != null) {	257	if (state != null) {
258	return (getLockUsage(state).equals(LockUsage.UNLOCKING));	258	return (getLockUsage(state).equals(LockUsage.UNLOCKING));
259	}	259	}
260	return true;	260	return true;
261	}	261	}
262	private boolean locking( SingleLockState onCreateState){	262	private boolean locking( SingleLockState onCreateState){
263	if (onCreateState != null) {	263	if (onCreateState != null) {
264	return (getLockUsage(onCreateState).equals(LockUsage.LOCKING));	264	return (getLockUsage(onCreateState).equals(LockUsage.LOCKING));
265	}	265	}
266	return false;	266	return false;
267	}	267	}
268	private Logger logger;	268	private Logger logger;
269	private void logNote( Result result){	269	private void logNote( Result result){
270	logger.add(result);	270	logger.add(result);
271	}	271	}
272	public Logger getLogger(){	272	public Logger getLogger(){
273	return logger;	273	return logger;
274	}	274	}
275	private SingleLockState getServiceOnStart(){	275	private SingleLockState getServiceOnStart(){
276	SingleLockState onStart=map.get("onStart");	276	SingleLockState onStart=map.get("onStart");
277	SingleLockState onStartCommand=map.get("onStartCommand");	277	SingleLockState onStartCommand=map.get("onStartCommand");
278	if (onStartCommand == null) {	278	if (onStartCommand == null) {
279	return onStart;	279	return onStart;
280	}	280	}
281	else {	281	else {
282	return onStartCommand;	282	return onStartCommand;
283	}	283	}
284	}	284	}
285	/**	285	/**
286	* TODO: make sure the same lock is locked and unlocked...	286	* TODO: make sure the same lock is locked and unlocked...
287	*/	287	*/
288	public void solveFacts(){	288	public void solveFacts(){
289	if (component.getComponentType().equals("Activity")) {	289	if (component.getComponentType().equals("Activity")) {
290	SingleLockState onCreateState=map.get("onCreate");	290	SingleLockState onCreateState=map.get("onCreate");
291	if (locking(onCreateState)) {	291	if (locking(onCreateState)) {
292	logNote(new Result(ResultType.LOCKING_ON_CREATE,component.toString()));	292	logNote(new Result(ResultType.LOCKING_ON_CREATE,component.toString()));
293	}	293	}
294	SingleLockState onStartState=map.get("onStart");	294	SingleLockState onStartState=map.get("onStart");
295	if (locking(onStartState)) {	295	if (locking(onStartState)) {
296	logNote(new Result(ResultType.LOCKING_ON_START,component.toString()));	296	logNote(new Result(ResultType.LOCKING_ON_START,component.toString()));
297	}	297	}
298	SingleLockState onRestartState=map.get("onRestart");	298	SingleLockState onRestartState=map.get("onRestart");
299	if (locking(onRestartState)) {	299	if (locking(onRestartState)) {
300	logNote(new Result(ResultType.LOCKING_ON_RESTART,component.toString()));	300	logNote(new Result(ResultType.LOCKING_ON_RESTART,component.toString()));
301	}	301	}
302	SingleLockState onPauseState=map.get("onPause");	302	SingleLockState onPauseState=map.get("onPause");
303	if (!unlocking(onPauseState)) {	303	if (!unlocking(onPauseState)) {
304	logNote(new Result(ResultType.STRONG_PAUSE_RESUME,component.toString()));	304	logNote(new Result(ResultType.STRONG_PAUSE_RESUME,component.toString()));
305	}	305	}
306	if (weakUnlocking(onPauseState) && (!strongUnlocking(onPauseState))) {	306	if (weakUnlocking(onPauseState) && (!strongUnlocking(onPauseState))) {
307	logNote(new Result(ResultType.WEAK_PAUSE_RESUME,component.toString()));	307	logNote(new Result(ResultType.WEAK_PAUSE_RESUME,component.toString()));
308	}	308	}
309	}	309	}
310	if (component.getComponentType().equals("Service")) {	310	SingleLockState onStartState=getServiceOnStart();
311	SingleLockState onStartState=getServiceOnStart();	311	SingleLockState onDestroyState=map.get("onDestroy");
312	SingleLockState onDestroyState=map.get("onDestroy");	312	if (locking(onStartState) && (!unlocking(onDestroyState))) {
313	if (locking(onStartState) && (!unlocking(onDestroyState))) {	313	logNote(new Result(ResultType.STRONG_SERVICE_DESTROY,component.toString()));
314	logNote(new Result(ResultType.STRONG_SERVICE_DESTROY,component.toString()));
315	}
316	if (weakUnlocking(onDestroyState)) {
317	logNote(new Result(ResultType.WEAK_SERVICE_DESTROY,component.toString()));
318	}
319	}
320	if (component.getComponentType().equals("RunnableThread")) {
321	SingleLockState runState=map.get("run");
322	if (locking(runState)) {
323	logNote(new Result(ResultType.THREAD_RUN,component.toString()));
324	}
325	}
326	if (component.getComponentType().equals("Handler")) {
327	SingleLockState handleState=map.get("handleMessage");
328	if (unlocking(handleState) && (!strongUnlocking(handleState))) {
329	logNote(new Result(ResultType.WEAK_SERVICE_DESTROY,component.toString()));
330	}
331	}
332	if (component.getComponentType().equals("BroadcastReceiver")) {
333	SingleLockState onReceiveState=map.get("onReceive");
334	if (locking(onReceiveState)) {
335	logNote(new Result(ResultType.BROADCAST_RECEIVER_ONRECEIVE,component.toString()));
336	}
337	}	314	}
338	}	315	}
339	}	316	}
340	}	317	}

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_070 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_071

Modified lines:	1, 5, 310, 311, 312, 313
Added line:	314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336
Removed line:	None

	DiffViewer/output/AnalysisResults.java//AnalysisResults.java_071		DiffViewer/output/AnalysisResults.java//AnalysisResults.java_072
	317 lines 12643 bytes Last modified : Mon May 14 23:48:12 2012		340 lines 13690 bytes Last modified : Mon May 14 23:48:12 2012
1	//Time : 2012-04-26 20:49:37.253	1	//Time : 2012-04-26 20:49:39.030
2	//Files Open : /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/ComponentManager.java /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java	2	//Files Open : /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/ComponentManager.java /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java
3	/*AST Changes :	3	/*AST Changes :
4	CHANGE ClassOrInterfaceDeclaration to ClassOrInterfaceDeclaration = 1	4	CHANGE ClassOrInterfaceDeclaration to ClassOrInterfaceDeclaration = 1
5	CHANGE ExpressionStmt ExpressionStmt IfStmt to IfStmt IfStmt IfStmt IfStmt = 1	5	CHANGE IfStmt IfStmt IfStmt IfStmt to ExpressionStmt ExpressionStmt IfStmt = 1
6	CHANGE MethodDeclaration to MethodDeclaration = 1	6	CHANGE MethodDeclaration to MethodDeclaration = 1
7	changes = 3	7	changes = 3
8	changes to method solveFacts = 1	8	changes to method solveFacts = 1
9	private/protected method declarations = 1	9	private/protected method declarations = 1
10	*/package energy.analysis;	10	*/package energy.analysis;
11	import java.util.ArrayList;	11	import java.util.ArrayList;
12	import java.util.HashMap;	12	import java.util.HashMap;
13	import java.util.HashSet;	13	import java.util.HashSet;
14	import java.util.Iterator;	14	import java.util.Iterator;
15	import java.util.Map;	15	import java.util.Map;
16	import java.util.Map.Entry;	16	import java.util.Map.Entry;
17	import java.util.Set;	17	import java.util.Set;
18	import com.ibm.wala.ipa.callgraph.CGNode;	18	import com.ibm.wala.ipa.callgraph.CGNode;
19	import com.ibm.wala.util.collections.Pair;	19	import com.ibm.wala.util.collections.Pair;
20	import energy.analysis.WakeLockManager.WakeLockInstance;	20	import energy.analysis.WakeLockManager.WakeLockInstance;
21	import energy.components.Component;	21	import energy.components.Component;
22	import energy.components.Component.CallBack;	22	import energy.components.Component.CallBack;
23	import energy.interproc.CompoundLockState;	23	import energy.interproc.CompoundLockState;
24	import energy.interproc.SingleLockState;	24	import energy.interproc.SingleLockState;
25	public class AnalysisResults {	25	public class AnalysisResults {
26	/**	26	/**
27	* Main structures that hold the analysis results for every component	27	* Main structures that hold the analysis results for every component
28	*/	28	*/
29	private HashSet<Pair<Component,ComponentSummary>> allStates=null;	29	private HashSet<Pair<Component,ComponentSummary>> allStates=null;
30	public class ComponentSummary {	30	public class ComponentSummary {
31	private Component component;	31	private Component component;
32	private HashMap<CallBack,CompoundLockState> callBackExitStates;	32	private HashMap<CallBack,CompoundLockState> callBackExitStates;
33	private HashMap<CGNode,CompoundLockState> allExitStates;	33	private HashMap<CGNode,CompoundLockState> allExitStates;
34	public ComponentSummary( Component c){	34	public ComponentSummary( Component c){
35	this.component=c;	35	this.component=c;
36	allExitStates=new HashMap<CGNode,CompoundLockState>();	36	allExitStates=new HashMap<CGNode,CompoundLockState>();
37	callBackExitStates=new HashMap<Component.CallBack,CompoundLockState>();	37	callBackExitStates=new HashMap<Component.CallBack,CompoundLockState>();
38	}	38	}
39	public HashMap<CGNode,CompoundLockState> getAllExitStates(){	39	public HashMap<CGNode,CompoundLockState> getAllExitStates(){
40	return allExitStates;	40	return allExitStates;
41	}	41	}
42	public void registerNodeState( CGNode n, CompoundLockState st){	42	public void registerNodeState( CGNode n, CompoundLockState st){
43	allExitStates.put(n,st);	43	allExitStates.put(n,st);
44	}	44	}
45	public void registerCallBackState( CallBack cb, CompoundLockState st){	45	public void registerCallBackState( CallBack cb, CompoundLockState st){
46	callBackExitStates.put(cb,st);	46	callBackExitStates.put(cb,st);
47	}	47	}
48	public CompoundLockState getStateForMethod( String method){	48	public CompoundLockState getStateForMethod( String method){
49	return allExitStates.get(method);	49	return allExitStates.get(method);
50	}	50	}
51	public String toString(){	51	public String toString(){
52	StringBuffer sb=new StringBuffer();	52	StringBuffer sb=new StringBuffer();
53	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {	53	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {
54	CGNode next=it.next();	54	CGNode next=it.next();
55	String name=next.getMethod().getName().toString();	55	String name=next.getMethod().getName().toString();
56	CompoundLockState stateForMethod=getStateForMethod(name);	56	CompoundLockState stateForMethod=getStateForMethod(name);
57	if (stateForMethod != null) {	57	if (stateForMethod != null) {
58	sb.append(name + ":\n" + stateForMethod.toString());	58	sb.append(name + ":\n" + stateForMethod.toString());
59	}	59	}
60	}	60	}
61	HashSet<CallBack> callbacks=component.getCallbacks();	61	HashSet<CallBack> callbacks=component.getCallbacks();
62	if (callbacks != null) {	62	if (callbacks != null) {
63	if (callbacks.size() > 0) {	63	if (callbacks.size() > 0) {
64	sb.append("Callbacks:\n");	64	sb.append("Callbacks:\n");
65	for ( CallBack cb : callbacks) {	65	for ( CallBack cb : callbacks) {
66	String name=cb.getName();	66	String name=cb.getName();
67	;	67	;
68	CompoundLockState stateForMethod=getStateForMethod(name);	68	CompoundLockState stateForMethod=getStateForMethod(name);
69	if (stateForMethod != null) {	69	if (stateForMethod != null) {
70	sb.append(" " + name + ":\n"+ stateForMethod.toString());	70	sb.append(" " + name + ":\n"+ stateForMethod.toString());
71	}	71	}
72	}	72	}
73	}	73	}
74	}	74	}
75	return null;	75	return null;
76	}	76	}
77	}	77	}
78	public AnalysisResults(){	78	public AnalysisResults(){
79	allStates=new HashSet<Pair<Component,ComponentSummary>>();	79	allStates=new HashSet<Pair<Component,ComponentSummary>>();
80	}	80	}
81	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}	81	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}
82	public enum ResultType { UNRESOLVED_INTERESTING_CALLBACKS, LOCKING_ON_CREATE, START_DESTROY, SERVICE_DESTROY, THREAD_RUN, HANDLE_MESSAGE, BROADCAST_RECEIVER_ONRECEIVE, LOCKING_ON_START, LOCKING_ON_RESTART, STRONG_PAUSE_RESUME, WEAK_PAUSE_RESUME, WEAK_SERVICE_DESTROY, STRONG_SERVICE_DESTROY, DID_NOT_PROCESS, OPTIMIZATION_FAILURE, ANALYSIS_FAILURE, UNIMPLEMENTED_FAILURE}	82	public enum ResultType { UNRESOLVED_INTERESTING_CALLBACKS, LOCKING_ON_CREATE, START_DESTROY, SERVICE_DESTROY, THREAD_RUN, HANDLE_MESSAGE, BROADCAST_RECEIVER_ONRECEIVE, LOCKING_ON_START, LOCKING_ON_RESTART, STRONG_PAUSE_RESUME, WEAK_PAUSE_RESUME, WEAK_SERVICE_DESTROY, STRONG_SERVICE_DESTROY, DID_NOT_PROCESS, OPTIMIZATION_FAILURE, ANALYSIS_FAILURE, UNIMPLEMENTED_FAILURE}
83	public static class Result {	83	public static class Result {
84	private ResultType resultType;	84	private ResultType resultType;
85	private String message;	85	private String message;
86	public ResultType getResultType(){	86	public ResultType getResultType(){
87	return resultType;	87	return resultType;
88	}	88	}
89	public String getMessage(){	89	public String getMessage(){
90	return message;	90	return message;
91	}	91	}
92	public Result( ResultType rt, String msg){	92	public Result( ResultType rt, String msg){
93	message=msg;	93	message=msg;
94	resultType=rt;	94	resultType=rt;
95	}	95	}
96	public String toString(){	96	public String toString(){
97	return (resultType.name() + " " + message);	97	return (resultType.name() + " " + message);
98	}	98	}
99	}	99	}
100	/**	100	/**
101	* Invoke this after the component has been analyzed	101	* Invoke this after the component has been analyzed
102	* @param component	102	* @param component
103	*/	103	*/
104	public void createComponentSummary( Component component){	104	public void createComponentSummary( Component component){
105	ComponentSummary componentSummary=new ComponentSummary(component);	105	ComponentSummary componentSummary=new ComponentSummary(component);
106	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {	106	for (Iterator<CGNode> it=component.getCallgraph().iterator(); it.hasNext(); ) {
107	CGNode next=it.next();	107	CGNode next=it.next();
108	Map<WakeLockInstance,Set<SingleLockState>> exitState=component.getExitState(next);	108	Map<WakeLockInstance,Set<SingleLockState>> exitState=component.getExitState(next);
109	if (exitState != null) {	109	if (exitState != null) {
110	CompoundLockState compoundLockState=new CompoundLockState(exitState);	110	CompoundLockState compoundLockState=new CompoundLockState(exitState);
111	componentSummary.registerNodeState(next,compoundLockState);	111	componentSummary.registerNodeState(next,compoundLockState);
112	}	112	}
113	}	113	}
114	allStates.add(Pair.make(component,componentSummary));	114	allStates.add(Pair.make(component,componentSummary));
115	}	115	}
116	private LockUsage getLockUsage( SingleLockState runState){	116	private LockUsage getLockUsage( SingleLockState runState){
117	if (runState != null) {	117	if (runState != null) {
118	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {	118	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {
119	return LockUsage.LOCKING;	119	return LockUsage.LOCKING;
120	}	120	}
121	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	121	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
122	return LockUsage.EMPTY;	122	return LockUsage.EMPTY;
123	}	123	}
124	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	124	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
125	return LockUsage.FULL_UNLOCKING;	125	return LockUsage.FULL_UNLOCKING;
126	}	126	}
127	else if (runState.isMaybeReleased()) {	127	else if (runState.isMaybeReleased()) {
128	return LockUsage.UNLOCKING;	128	return LockUsage.UNLOCKING;
129	}	129	}
130	else {	130	else {
131	return LockUsage.UNKNOWN_STATE;	131	return LockUsage.UNKNOWN_STATE;
132	}	132	}
133	}	133	}
134	else {	134	else {
135	return LockUsage.EMPTY;	135	return LockUsage.EMPTY;
136	}	136	}
137	}	137	}
138	public ArrayList<Result> processResults(){	138	public ArrayList<Result> processResults(){
139	ArrayList<Result> result=new ArrayList<Result>();	139	ArrayList<Result> result=new ArrayList<Result>();
140	System.out.println("\n==========================================");	140	System.out.println("\n==========================================");
141	HashMap<LockUsage,Set<Pair<Component,CGNode>>> usageMap=new HashMap<LockUsage,Set<Pair<Component,CGNode>>>();	141	HashMap<LockUsage,Set<Pair<Component,CGNode>>> usageMap=new HashMap<LockUsage,Set<Pair<Component,CGNode>>>();
142	HashMap<Component,Logger> componentMap=new HashMap<Component,Logger>();	142	HashMap<Component,Logger> componentMap=new HashMap<Component,Logger>();
143	for ( Pair<Component,ComponentSummary> pair : allStates) {	143	for ( Pair<Component,ComponentSummary> pair : allStates) {
144	Component component=pair.fst;	144	Component component=pair.fst;
145	ComponentSummary cSummary=pair.snd;	145	ComponentSummary cSummary=pair.snd;
146	ComponentPolicy policy=new ComponentPolicy(component);	146	ComponentPolicy policy=new ComponentPolicy(component);
147	StringBuffer sb=new StringBuffer();	147	StringBuffer sb=new StringBuffer();
148	boolean printComponent=false;	148	boolean printComponent=false;
149	for ( Entry<CGNode,CompoundLockState> e : cSummary.getAllExitStates().entrySet()) {	149	for ( Entry<CGNode,CompoundLockState> e : cSummary.getAllExitStates().entrySet()) {
150	CGNode node=e.getKey();	150	CGNode node=e.getKey();
151	HashMap<WakeLockInstance,LockUsage> lockUsages=new HashMap<WakeLockInstance,LockUsage>();	151	HashMap<WakeLockInstance,LockUsage> lockUsages=new HashMap<WakeLockInstance,LockUsage>();
152	boolean printMethod=false;	152	boolean printMethod=false;
153	LockUsage lockUsage=LockUsage.EMPTY;	153	LockUsage lockUsage=LockUsage.EMPTY;
154	CompoundLockState compLS=e.getValue();	154	CompoundLockState compLS=e.getValue();
155	Map<WakeLockInstance,Set<SingleLockState>> allLockStates=compLS.getAllLockStates();	155	Map<WakeLockInstance,Set<SingleLockState>> allLockStates=compLS.getAllLockStates();
156	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : allLockStates.entrySet()) {	156	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : allLockStates.entrySet()) {
157	WakeLockInstance wli=fs.getKey();	157	WakeLockInstance wli=fs.getKey();
158	Set<SingleLockState> sls=fs.getValue();	158	Set<SingleLockState> sls=fs.getValue();
159	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);	159	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);
160	lockUsage=getLockUsage(sl);	160	lockUsage=getLockUsage(sl);
161	lockUsages.put(wli,lockUsage);	161	lockUsages.put(wli,lockUsage);
162	if (lockUsage != LockUsage.EMPTY) {	162	if (lockUsage != LockUsage.EMPTY) {
163	printMethod=true;	163	printMethod=true;
164	}	164	}
165	}	165	}
166	if (printMethod) {	166	if (printMethod) {
167	if (Opts.OUTPUT_ALL_NODE_INFO \|\| component.isCallBack(node)) {	167	if (Opts.OUTPUT_ALL_NODE_INFO \|\| component.isCallBack(node)) {
168	printComponent=true;	168	printComponent=true;
169	HashSet<SingleLockState> tempState=new HashSet<SingleLockState>();	169	HashSet<SingleLockState> tempState=new HashSet<SingleLockState>();
170	sb.append(" " + node.getMethod().getSignature().toString() + "\n");	170	sb.append(" " + node.getMethod().getSignature().toString() + "\n");
171	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : compLS.getAllLockStates().entrySet()) {	171	for ( Entry<WakeLockInstance,Set<SingleLockState>> fs : compLS.getAllLockStates().entrySet()) {
172	WakeLockInstance key=fs.getKey();	172	WakeLockInstance key=fs.getKey();
173	Set<SingleLockState> value=fs.getValue();	173	Set<SingleLockState> value=fs.getValue();
174	tempState.add(SingleLockState.mergeSingleLockStates(value));	174	tempState.add(SingleLockState.mergeSingleLockStates(value));
175	sb.append("\t" + key.toString() + "\n\t"+ value.toString()+ "\n");	175	sb.append("\t" + key.toString() + "\n\t"+ value.toString()+ "\n");
176	}	176	}
177	SingleLockState mergedLS=SingleLockState.mergeSingleLockStates(tempState);	177	SingleLockState mergedLS=SingleLockState.mergeSingleLockStates(tempState);
178	LockUsage lu=getLockUsage(mergedLS);	178	LockUsage lu=getLockUsage(mergedLS);
179	if (component.isCallBack(node)) {	179	if (component.isCallBack(node)) {
180	if (usageMap.containsKey(lu)) {	180	if (usageMap.containsKey(lu)) {
181	usageMap.get(lu).add(Pair.make(component,node));	181	usageMap.get(lu).add(Pair.make(component,node));
182	}	182	}
183	else {	183	else {
184	HashSet<Pair<Component,CGNode>> set=new HashSet<Pair<Component,CGNode>>();	184	HashSet<Pair<Component,CGNode>> set=new HashSet<Pair<Component,CGNode>>();
185	set.add(Pair.make(component,node));	185	set.add(Pair.make(component,node));
186	usageMap.put(lu,set);	186	usageMap.put(lu,set);
187	}	187	}
188	policy.addFact(node,mergedLS);	188	policy.addFact(node,mergedLS);
189	}	189	}
190	}	190	}
191	}	191	}
192	}	192	}
193	if (printComponent) {	193	if (printComponent) {
194	System.out.println(component.toString() + "\n" + sb.toString());	194	System.out.println(component.toString() + "\n" + sb.toString());
195	policy.solveFacts();	195	policy.solveFacts();
196	componentMap.put(component,policy.getLogger());	196	componentMap.put(component,policy.getLogger());
197	}	197	}
198	}	198	}
199	System.out.println("==========================================\n");	199	System.out.println("==========================================\n");
200	for ( LockUsage e : usageMap.keySet()) {	200	for ( LockUsage e : usageMap.keySet()) {
201	System.out.println(e.toString());	201	System.out.println(e.toString());
202	for ( Pair<Component,CGNode> s : usageMap.get(e)) {	202	for ( Pair<Component,CGNode> s : usageMap.get(e)) {
203	System.out.println(" " + s.toString());	203	System.out.println(" " + s.toString());
204	}	204	}
205	}	205	}
206	System.out.println("==========================================\n");	206	System.out.println("==========================================\n");
207	for ( Component e : componentMap.keySet()) {	207	for ( Component e : componentMap.keySet()) {
208	Logger logger=componentMap.get(e);	208	Logger logger=componentMap.get(e);
209	if (!logger.isEmpty()) {	209	if (!logger.isEmpty()) {
210	System.out.println(e.toString());	210	System.out.println(e.toString());
211	System.out.println(logger.toString());	211	System.out.println(logger.toString());
212	System.out.println("\n");	212	System.out.println("\n");
213	}	213	}
214	result=logger.getStringList();	214	result=logger.getStringList();
215	}	215	}
216	return result;	216	return result;
217	}	217	}
218	public class Logger extends ArrayList<Result> {	218	public class Logger extends ArrayList<Result> {
219	private static final long serialVersionUID=4402714524487791090L;	219	private static final long serialVersionUID=4402714524487791090L;
220	public void output(){	220	public void output(){
221	for ( Result r : this) {	221	for ( Result r : this) {
222	System.out.println(" " + r.getResultType().toString());	222	System.out.println(" " + r.getResultType().toString());
223	}	223	}
224	}	224	}
225	public ArrayList<Result> getStringList(){	225	public ArrayList<Result> getStringList(){
226	return this;	226	return this;
227	}	227	}
228	public String toString(){	228	public String toString(){
229	StringBuffer result=new StringBuffer();	229	StringBuffer result=new StringBuffer();
230	for ( Result r : this) {	230	for ( Result r : this) {
231	result.append(r.toString() + "\n");	231	result.append(r.toString() + "\n");
232	}	232	}
233	return result.toString();	233	return result.toString();
234	}	234	}
235	}	235	}
236	public class ComponentPolicy {	236	public class ComponentPolicy {
237	private Component component;	237	private Component component;
238	public ComponentPolicy( Component component){	238	public ComponentPolicy( Component component){
239	this.component=component;	239	this.component=component;
240	map=new HashMap<String,SingleLockState>();	240	map=new HashMap<String,SingleLockState>();
241	logger=new Logger();	241	logger=new Logger();
242	}	242	}
243	private HashMap<String,SingleLockState> map;	243	private HashMap<String,SingleLockState> map;
244	public void addFact( CGNode n, SingleLockState st){	244	public void addFact( CGNode n, SingleLockState st){
245	map.put(n.getMethod().getName().toString(),st);	245	map.put(n.getMethod().getName().toString(),st);
246	}	246	}
247	private boolean unlocking( SingleLockState state){	247	private boolean unlocking( SingleLockState state){
248	return (strongUnlocking(state) \|\| weakUnlocking(state));	248	return (strongUnlocking(state) \|\| weakUnlocking(state));
249	}	249	}
250	private boolean strongUnlocking( SingleLockState state){	250	private boolean strongUnlocking( SingleLockState state){
251	if (state != null) {	251	if (state != null) {
252	return (getLockUsage(state).equals(LockUsage.FULL_UNLOCKING));	252	return (getLockUsage(state).equals(LockUsage.FULL_UNLOCKING));
253	}	253	}
254	return true;	254	return true;
255	}	255	}
256	private boolean weakUnlocking( SingleLockState state){	256	private boolean weakUnlocking( SingleLockState state){
257	if (state != null) {	257	if (state != null) {
258	return (getLockUsage(state).equals(LockUsage.UNLOCKING));	258	return (getLockUsage(state).equals(LockUsage.UNLOCKING));
259	}	259	}
260	return true;	260	return true;
261	}	261	}
262	private boolean locking( SingleLockState onCreateState){	262	private boolean locking( SingleLockState onCreateState){
263	if (onCreateState != null) {	263	if (onCreateState != null) {
264	return (getLockUsage(onCreateState).equals(LockUsage.LOCKING));	264	return (getLockUsage(onCreateState).equals(LockUsage.LOCKING));
265	}	265	}
266	return false;	266	return false;
267	}	267	}
268	private Logger logger;	268	private Logger logger;
269	private void logNote( Result result){	269	private void logNote( Result result){
270	logger.add(result);	270	logger.add(result);
271	}	271	}
272	public Logger getLogger(){	272	public Logger getLogger(){
273	return logger;	273	return logger;
274	}	274	}
275	private SingleLockState getServiceOnStart(){	275	private SingleLockState getServiceOnStart(){
276	SingleLockState onStart=map.get("onStart");	276	SingleLockState onStart=map.get("onStart");
277	SingleLockState onStartCommand=map.get("onStartCommand");	277	SingleLockState onStartCommand=map.get("onStartCommand");
278	if (onStartCommand == null) {	278	if (onStartCommand == null) {
279	return onStart;	279	return onStart;
280	}	280	}
281	else {	281	else {
282	return onStartCommand;	282	return onStartCommand;
283	}	283	}
284	}	284	}
285	/**	285	/**
286	* TODO: make sure the same lock is locked and unlocked...	286	* TODO: make sure the same lock is locked and unlocked...
287	*/	287	*/
288	public void solveFacts(){	288	public void solveFacts(){
289	if (component.getComponentType().equals("Activity")) {	289	if (component.getComponentType().equals("Activity")) {
290	SingleLockState onCreateState=map.get("onCreate");	290	SingleLockState onCreateState=map.get("onCreate");
291	if (locking(onCreateState)) {	291	if (locking(onCreateState)) {
292	logNote(new Result(ResultType.LOCKING_ON_CREATE,component.toString()));	292	logNote(new Result(ResultType.LOCKING_ON_CREATE,component.toString()));
293	}	293	}
294	SingleLockState onStartState=map.get("onStart");	294	SingleLockState onStartState=map.get("onStart");
295	if (locking(onStartState)) {	295	if (locking(onStartState)) {
296	logNote(new Result(ResultType.LOCKING_ON_START,component.toString()));	296	logNote(new Result(ResultType.LOCKING_ON_START,component.toString()));
297	}	297	}
298	SingleLockState onRestartState=map.get("onRestart");	298	SingleLockState onRestartState=map.get("onRestart");
299	if (locking(onRestartState)) {	299	if (locking(onRestartState)) {
300	logNote(new Result(ResultType.LOCKING_ON_RESTART,component.toString()));	300	logNote(new Result(ResultType.LOCKING_ON_RESTART,component.toString()));
301	}	301	}
302	SingleLockState onPauseState=map.get("onPause");	302	SingleLockState onPauseState=map.get("onPause");
303	if (!unlocking(onPauseState)) {	303	if (!unlocking(onPauseState)) {
304	logNote(new Result(ResultType.STRONG_PAUSE_RESUME,component.toString()));	304	logNote(new Result(ResultType.STRONG_PAUSE_RESUME,component.toString()));
305	}	305	}
306	if (weakUnlocking(onPauseState) && (!strongUnlocking(onPauseState))) {	306	if (weakUnlocking(onPauseState) && (!strongUnlocking(onPauseState))) {
307	logNote(new Result(ResultType.WEAK_PAUSE_RESUME,component.toString()));	307	logNote(new Result(ResultType.WEAK_PAUSE_RESUME,component.toString()));
308	}	308	}
309	}	309	}
310	SingleLockState onStartState=getServiceOnStart();	310	if (component.getComponentType().equals("Service")) {
311	SingleLockState onDestroyState=map.get("onDestroy");	311	SingleLockState onStartState=getServiceOnStart();
312	if (locking(onStartState) && (!unlocking(onDestroyState))) {	312	SingleLockState onDestroyState=map.get("onDestroy");
313	logNote(new Result(ResultType.STRONG_SERVICE_DESTROY,component.toString()));	313	if (locking(onStartState) && (!unlocking(onDestroyState))) {
		314	logNote(new Result(ResultType.STRONG_SERVICE_DESTROY,component.toString()));
		315	}
		316	if (weakUnlocking(onDestroyState) && !str) {
		317	logNote(new Result(ResultType.WEAK_SERVICE_DESTROY,component.toString()));
		318	}
		319	}
		320	if (component.getComponentType().equals("RunnableThread")) {
		321	SingleLockState runState=map.get("run");
		322	if (locking(runState)) {
		323	logNote(new Result(ResultType.THREAD_RUN,component.toString()));
		324	}
		325	}
		326	if (component.getComponentType().equals("Handler")) {
		327	SingleLockState handleState=map.get("handleMessage");
		328	if (unlocking(handleState) && (!strongUnlocking(handleState))) {
		329	logNote(new Result(ResultType.WEAK_SERVICE_DESTROY,component.toString()));
		330	}
		331	}
		332	if (component.getComponentType().equals("BroadcastReceiver")) {
		333	SingleLockState onReceiveState=map.get("onReceive");
		334	if (locking(onReceiveState)) {
		335	logNote(new Result(ResultType.BROADCAST_RECEIVER_ONRECEIVE,component.toString()));
		336	}
314	}	337	}
315	}	338	}
316	}	339	}
317	}	340	}

Generated by diff2html on Mon May 14 23:48:34 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_071 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_072

Modified lines:	1, 5, 7, 316
Added line:	None
Removed line:	None

Generated by diff2html on Mon May 14 23:48:35 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_072 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_073

Modified lines:	1, 316
Added line:	None
Removed line:	None

Generated by diff2html on Mon May 14 23:48:35 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_073 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_074

Modified lines:	1, 4, 5, 6, 7, 8, 9, 316
Added line:	10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24
Removed line:	None

Generated by diff2html on Mon May 14 23:48:35 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_074 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_075

Modified lines:	1, 4, 24, 331
Added line:	332
Removed line:	None

Generated by diff2html on Mon May 14 23:48:35 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_075 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_076

Modified lines:	1, 4, 5, 6, 7, 8, 9, 10, 331
Added line:	None
Removed line:	11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 332

Generated by diff2html on Mon May 14 23:48:35 2012
Command-line: /usr/bin/diff2html DiffViewer/output/AnalysisResults.java//AnalysisResults.java_076 DiffViewer/output/AnalysisResults.java//AnalysisResults.java_077

	DiffViewer/output/AnalysisResults.java//AnalysisResults.java_002		DiffViewer/output/AnalysisResults.java//AnalysisResults.java_003
	133 lines 5548 bytes Last modified : Mon May 14 23:47:19 2012		133 lines 5550 bytes Last modified : Mon May 14 23:47:19 2012
1	//Time : 2012-04-12 06:35:08.289	1	//Time : 2012-04-12 06:35:09.539
2	//Files Open : /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java /pvekris/src/main/java/energy/interproc/CtxSensLocking.java /pvekris/src/main/java/energy/analysis/WakeLockManager.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/SpecialConditions.java /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/ComponentManager.java	2	//Files Open : /mcmutton/src/main/java/edu/ucsd/salud/mcmutton/BugHunt.java /pvekris/src/main/java/energy/interproc/CtxSensLocking.java /pvekris/src/main/java/energy/analysis/WakeLockManager.java /pvekris/src/main/java/energy/analysis/Opts.java /pvekris/src/main/java/energy/analysis/SpecialConditions.java /pvekris/src/main/java/energy/analysis/AnalysisResults.java /pvekris/src/main/java/energy/analysis/ComponentManager.java
3	/*AST Changes :	3	/*AST Changes :
4	CHANGE ExpressionStmt to ExpressionStmt = 1	4	CHANGE ExpressionStmt to ExpressionStmt = 1
5	CHANGE MethodDeclaration to MethodDeclaration = 1	5	CHANGE MethodDeclaration to MethodDeclaration = 1
6	changes = 2	6	changes = 2
7	changes to method processResults = 1	7	changes to method processResults = 1
8	public method declarations = 1	8	public method declarations = 1
9	*/package energy.analysis;	9	*/package energy.analysis;
10	import java.util.EnumMap;	10	import java.util.EnumMap;
11	import java.util.HashMap;	11	import java.util.HashMap;
12	import java.util.HashSet;	12	import java.util.HashSet;
13	import java.util.Map;	13	import java.util.Map;
14	import java.util.Map.Entry;	14	import java.util.Map.Entry;
15	import java.util.Set;	15	import java.util.Set;
16	import com.ibm.wala.types.FieldReference;	16	import com.ibm.wala.types.FieldReference;
17	import com.ibm.wala.util.collections.Pair;	17	import com.ibm.wala.util.collections.Pair;
18	import energy.components.Component;	18	import energy.components.Component;
19	import energy.interproc.CompoundLockState;	19	import energy.interproc.CompoundLockState;
20	import energy.interproc.SingleLockState;	20	import energy.interproc.SingleLockState;
21	import energy.util.E;	21	import energy.util.E;
22	public class AnalysisResults {	22	public class AnalysisResults {
23	private HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>> resultStuff=null;	23	private HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>> resultStuff=null;
24	public class ComponentResult {	24	public class ComponentResult {
25	HashMap<String,CompoundLockState> callBackExitStates;	25	HashMap<String,CompoundLockState> callBackExitStates;
26	public ComponentResult(){	26	public ComponentResult(){
27	callBackExitStates=new HashMap<String,CompoundLockState>();	27	callBackExitStates=new HashMap<String,CompoundLockState>();
28	}	28	}
29	}	29	}
30	/**	30	/**
31	* The constructor	31	* The constructor
32	*/	32	*/
33	AnalysisResults(){	33	AnalysisResults(){
34	resultStuff=new HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>>();	34	resultStuff=new HashSet<Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>>>();
35	callBackResultMap=new HashMap<Pair<String,String>,EnumMap<LockUsage,Integer>>();	35	callBackResultMap=new HashMap<Pair<String,String>,EnumMap<LockUsage,Integer>>();
36	}	36	}
37	int threadCount=0;	37	int threadCount=0;
38	int activityCount=0;	38	int activityCount=0;
39	int lockThreads=0;	39	int lockThreads=0;
40	int nolockThreads=0;	40	int nolockThreads=0;
41	int unlockThreads=0;	41	int unlockThreads=0;
42	int lockunlockThreads=0;	42	int lockunlockThreads=0;
43	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}	43	public enum LockUsage { LOCKING, UNLOCKING, NOLOCKING, LOCKUNLOCK, EMPTY, UNKNOWN_STATE, FULL_UNLOCKING}
44	private Map<Pair<String,String>,EnumMap<LockUsage,Integer>> callBackResultMap;	44	private Map<Pair<String,String>,EnumMap<LockUsage,Integer>> callBackResultMap;
45	public void registerExitLockState( Component component, Map<String,Map<FieldReference,Set<SingleLockState>>> map){	45	public void registerExitLockState( Component component, Map<String,Map<FieldReference,Set<SingleLockState>>> map){
46	resultStuff.add(Pair.make(component,map));	46	resultStuff.add(Pair.make(component,map));
47	StringBuffer sb=new StringBuffer();	47	StringBuffer sb=new StringBuffer();
48	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : map.entrySet()) {	48	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : map.entrySet()) {
49	if (e.getValue().size() > 0) {	49	if (e.getValue().size() > 0) {
50	sb.append(e.getKey() + "\n");	50	sb.append(e.getKey() + "\n");
51	for ( Entry<FieldReference,Set<SingleLockState>> entry : e.getValue().entrySet()) {	51	for ( Entry<FieldReference,Set<SingleLockState>> entry : e.getValue().entrySet()) {
52	sb.append(entry.getKey() + " -> " + entry.getValue().toString());	52	sb.append(entry.getKey() + " -> " + entry.getValue().toString());
53	}	53	}
54	}	54	}
55	}	55	}
56	if (sb.length() > 0) {	56	if (sb.length() > 0) {
57	E.log(1,component.toString() + "\n" + sb.toString());	57	E.log(1,component.toString() + "\n" + sb.toString());
58	}	58	}
59	}	59	}
60	private LockUsage getLockUsage( SingleLockState runState){	60	private LockUsage getLockUsage( SingleLockState runState){
61	if (runState != null) {	61	if (runState != null) {
62	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {	62	if (runState.isMaybeAcquired() && (!runState.isMaybeReleased())) {
63	return LockUsage.LOCKING;	63	return LockUsage.LOCKING;
64	}	64	}
65	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	65	else if (!runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
66	return LockUsage.EMPTY;	66	return LockUsage.EMPTY;
67	}	67	}
68	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {	68	else if (runState.isMaybeReleased() && (!runState.isMaybeAcquired())) {
69	return LockUsage.FULL_UNLOCKING;	69	return LockUsage.FULL_UNLOCKING;
70	}	70	}
71	else if (runState.isMaybeReleased()) {	71	else if (runState.isMaybeReleased()) {
72	return LockUsage.UNLOCKING;	72	return LockUsage.UNLOCKING;
73	}	73	}
74	else {	74	else {
75	return LockUsage.UNKNOWN_STATE;	75	return LockUsage.UNKNOWN_STATE;
76	}	76	}
77	}	77	}
78	else {	78	else {
79	return LockUsage.EMPTY;	79	return LockUsage.EMPTY;
80	}	80	}
81	}	81	}
82	public void processResults(){	82	public void processResults(){
83	System.out.println();	83	System.out.println("");
84	for ( Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>> pair : resultStuff) {	84	for ( Pair<Component,Map<String,Map<FieldReference,Set<SingleLockState>>>> pair : resultStuff) {
85	Component component=pair.fst;	85	Component component=pair.fst;
86	String componentName=component.getComponentName();	86	String componentName=component.getComponentName();
87	Map<String,Map<FieldReference,Set<SingleLockState>>> callBackMap=pair.snd;	87	Map<String,Map<FieldReference,Set<SingleLockState>>> callBackMap=pair.snd;
88	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : callBackMap.entrySet()) {	88	for ( Entry<String,Map<FieldReference,Set<SingleLockState>>> e : callBackMap.entrySet()) {
89	String callBackName=e.getKey();	89	String callBackName=e.getKey();
90	Pair<String,String> compAndCB=Pair.make(component.toString(),callBackName);	90	Pair<String,String> compAndCB=Pair.make(component.toString(),callBackName);
91	Pair<String,String> abstCompAndCB=Pair.make(componentName,callBackName);	91	Pair<String,String> abstCompAndCB=Pair.make(componentName,callBackName);
92	HashMap<FieldReference,LockUsage> lockUsages=new HashMap<FieldReference,LockUsage>();	92	HashMap<FieldReference,LockUsage> lockUsages=new HashMap<FieldReference,LockUsage>();
93	for ( Entry<FieldReference,Set<SingleLockState>> fs : e.getValue().entrySet()) {	93	for ( Entry<FieldReference,Set<SingleLockState>> fs : e.getValue().entrySet()) {
94	FieldReference field=fs.getKey();	94	FieldReference field=fs.getKey();
95	Set<SingleLockState> sls=fs.getValue();	95	Set<SingleLockState> sls=fs.getValue();
96	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);	96	SingleLockState sl=SingleLockState.mergeSingleLockStates(sls);
97	LockUsage lockUsage=getLockUsage(sl);	97	LockUsage lockUsage=getLockUsage(sl);
98	lockUsages.put(field,lockUsage);	98	lockUsages.put(field,lockUsage);
99	EnumMap<LockUsage,Integer> enumMap=callBackResultMap.get(abstCompAndCB);	99	EnumMap<LockUsage,Integer> enumMap=callBackResultMap.get(abstCompAndCB);
100	if (lockUsage != LockUsage.EMPTY) {	100	if (lockUsage != LockUsage.EMPTY) {
101	E.log(1,compAndCB.toString() + " :: " + lockUsage.toString());	101	E.log(1,compAndCB.toString() + " :: " + lockUsage.toString());
102	}	102	}
103	updateEnumMap(enumMap,lockUsage);	103	updateEnumMap(enumMap,lockUsage);
104	}	104	}
105	}	105	}
106	}	106	}
107	}	107	}
108	private void updateEnumMap( EnumMap<LockUsage,Integer> enumMap, LockUsage lockUsage){	108	private void updateEnumMap( EnumMap<LockUsage,Integer> enumMap, LockUsage lockUsage){
109	if (enumMap == null) {	109	if (enumMap == null) {
110	enumMap=new EnumMap<LockUsage,Integer>(LockUsage.class);	110	enumMap=new EnumMap<LockUsage,Integer>(LockUsage.class);
111	}	111	}
112	Integer count=enumMap.get(lockUsage);	112	Integer count=enumMap.get(lockUsage);
113	if (count == null) {	113	if (count == null) {
114	count=new Integer(1);	114	count=new Integer(1);
115	enumMap.put(lockUsage,count);	115	enumMap.put(lockUsage,count);
116	}	116	}
117	else {	117	else {
118	enumMap.put(lockUsage,count + 1);	118	enumMap.put(lockUsage,count + 1);
119	}	119	}
120	}	120	}
121	public void outputFinalResults(){	121	public void outputFinalResults(){
122	for ( Entry<Pair<String,String>,EnumMap<LockUsage,Integer>> e : callBackResultMap.entrySet()) {	122	for ( Entry<Pair<String,String>,EnumMap<LockUsage,Integer>> e : callBackResultMap.entrySet()) {
123	Pair<String,String> key=e.getKey();	123	Pair<String,String> key=e.getKey();
124	E.log(1,key.toString());	124	E.log(1,key.toString());
125	EnumMap<LockUsage,Integer> usages=e.getValue();	125	EnumMap<LockUsage,Integer> usages=e.getValue();
126	for ( Entry<LockUsage,Integer> u : usages.entrySet()) {	126	for ( Entry<LockUsage,Integer> u : usages.entrySet()) {
127	LockUsage usage=u.getKey();	127	LockUsage usage=u.getKey();
128	Integer count=u.getValue();	128	Integer count=u.getValue();
129	E.log(1,"--> " + usage.toString() + " :: "+ count.toString());	129	E.log(1,"--> " + usage.toString() + " :: "+ count.toString());
130	}	130	}
131	}	131	}
132	}	132	}
133	}	133	}